From 827963ffb3426653116df953bb52860fc636b086 Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko Date: Mon, 16 Aug 2021 22:11:07 -0700 Subject: [PATCH] sync: fix up docs sync path mapping Kernel docs from Documentation/bpf/libbpf go straight to docs/ under libbpf. Also ignore libbpf-only parts of docs subdir. Signed-off-by: Andrii Nakryiko --- docs/api.rst | 2 +- scripts/sync-kernel.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 56aa72f..781972d 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -3,7 +3,7 @@ .. _api: .. toctree:: Table of Contents - + LIBBPF API ================== diff --git a/scripts/sync-kernel.sh b/scripts/sync-kernel.sh index cf49f6d..ccf5a41 100755 --- a/scripts/sync-kernel.sh +++ b/scripts/sync-kernel.sh @@ -47,12 +47,12 @@ PATH_MAP=( \ [tools/include/uapi/linux/netlink.h]=include/uapi/linux/netlink.h \ [tools/include/uapi/linux/pkt_cls.h]=include/uapi/linux/pkt_cls.h \ [tools/include/uapi/linux/pkt_sched.h]=include/uapi/linux/pkt_sched.h \ - [Documentation/bpf/libbpf]=src/docs \ + [Documentation/bpf/libbpf]=docs \ ) LIBBPF_PATHS="${!PATH_MAP[@]} :^tools/lib/bpf/Makefile :^tools/lib/bpf/Build :^tools/lib/bpf/.gitignore :^tools/include/tools/libc_compat.h" LIBBPF_VIEW_PATHS="${PATH_MAP[@]}" -LIBBPF_VIEW_EXCLUDE_REGEX='^src/(Makefile|Build|test_libbpf\.c|bpf_helper_defs\.h|\.gitignore)$' +LIBBPF_VIEW_EXCLUDE_REGEX='^src/(Makefile|Build|test_libbpf\.c|bpf_helper_defs\.h|\.gitignore)$|^docs/(\.gitignore|api\.rst|conf\.py)$|^docs/sphinx/.*' LINUX_VIEW_EXCLUDE_REGEX='^include/tools/libc_compat.h$' LIBBPF_TREE_FILTER="mkdir -p __libbpf/include/uapi/linux __libbpf/include/tools && "$'\\\n'