From 3efc75ad9d9317e5709861bbebb2c29390f8e7a2 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 27 May 2024 08:02:43 +0200 Subject: scripts/update-linux-headers.sh: Remove temporary directory inbetween We are reusing the same temporary directory for installing the headers of all targets, so there could be stale files here when switching from one target to another. Make sure to delete the folder before installing a new set of target headers into it. Message-ID: <20240527060243.12647-1-thuth@redhat.com> Reviewed-by: Michael S. Tsirkin Acked-by: Cornelia Huck Signed-off-by: Thomas Huth --- scripts/update-linux-headers.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/update-linux-headers.sh') diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 8963c39189..fbf7e119bc 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -112,6 +112,7 @@ for arch in $ARCHLIST; do arch_var=ARCH fi + rm -rf "$hdrdir" make -C "$linux" O="$blddir" INSTALL_HDR_PATH="$hdrdir" $arch_var=$arch headers_install rm -rf "$output/linux-headers/asm-$arch" -- cgit 1.4.1 From bde26d90ae9f7551cac90e117fc7216c807a3bfe Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 27 May 2024 08:01:26 +0200 Subject: scripts/update-linux-headers.sh: Fix the path of setup_data.h When running the update-linx-headers.sh script, it currently fails with: scripts/update-linux-headers.sh: line 73: .../qemu/standard-headers/asm-x86/setup_data.h: No such file or directory The "include" folder is obviously missing here - no clue how this could have worked before? Fixes: 66210a1a30 ("scripts/update-linux-headers: Add setup_data.h to import list") Message-ID: <20240527060126.12578-1-thuth@redhat.com> Reviewed-by: Cornelia Huck Signed-off-by: Thomas Huth --- scripts/update-linux-headers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/update-linux-headers.sh') diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index fbf7e119bc..23afe8c08a 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -159,7 +159,7 @@ for arch in $ARCHLIST; do cp_portable "$hdrdir/bootparam.h" \ "$output/include/standard-headers/asm-$arch" cp_portable "$hdrdir/include/asm/setup_data.h" \ - "$output/standard-headers/asm-x86" + "$output/include/standard-headers/asm-x86" fi if [ $arch = riscv ]; then cp "$hdrdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/" -- cgit 1.4.1