From 95a9035e8b532124b521fb66391fafb86ae857c1 Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko Date: Mon, 16 Jun 2025 11:27:16 -0700 Subject: [PATCH] sync: adjust sync-kernel.sh script to handle UAPI header guards better Adjust the sync script to handle UAPI header guards with singular and double underscore between UAPI and LINUX. Kernel seems to have a mix of both approaches. Signed-off-by: Andrii Nakryiko --- scripts/sync-kernel.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/sync-kernel.sh b/scripts/sync-kernel.sh index 4bbfdae..5e2307f 100755 --- a/scripts/sync-kernel.sh +++ b/scripts/sync-kernel.sh @@ -63,7 +63,7 @@ LIBBPF_TREE_FILTER="mkdir -p __libbpf/include/uapi/linux __libbpf/include/tools for p in "${!PATH_MAP[@]}"; do LIBBPF_TREE_FILTER+="git mv -kf ${p} __libbpf/${PATH_MAP[${p}]} && "$'\\\n' done -LIBBPF_TREE_FILTER+="find __libbpf/include/uapi/linux -type f -exec sed -i 's/_UAPI__LINUX/__LINUX/' {} + && "$'\\\n' +LIBBPF_TREE_FILTER+="find __libbpf/include/uapi/linux -type f -exec sed -i 's/_UAPI\(__\?LINUX\)/\1/' {} + && "$'\\\n' LIBBPF_TREE_FILTER+="git rm --ignore-unmatch -f __libbpf/src/{Makefile,Build,test_libbpf.c,.gitignore} >/dev/null" cd_to() @@ -348,7 +348,7 @@ diff -u ${TMP_DIR}/linux-view.ls ${TMP_DIR}/github-view.ls echo "Comparing file contents..." CONSISTENT=1 for F in $(cat ${TMP_DIR}/linux-view.ls); do - if ! diff -u <(sed 's/_UAPI__LINUX/__LINUX/' "${LINUX_ABS_DIR}/${F}") "${GITHUB_ABS_DIR}/${F}"; then + if ! diff -u <(sed 's/_UAPI\(__\?LINUX\)/\1/' "${LINUX_ABS_DIR}/${F}") "${GITHUB_ABS_DIR}/${F}"; then echo "${LINUX_ABS_DIR}/${F} and ${GITHUB_ABS_DIR}/${F} are different!" CONSISTENT=0 fi