187 lines
8.7 KiB
Diff
187 lines
8.7 KiB
Diff
|
From 3d197f42afea6d0b176c2b26b772965692ffeab3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
|
||
|
|
Date: Tue, 14 May 2024 18:42:44 +0100
|
||
|
|
Subject: [PATCH 047/100] scripts/update-linux-header.sh: be more src tree
|
||
|
|
friendly
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
RH-MergeRequest: 245: SEV-SNP support
|
||
|
|
RH-Jira: RHEL-39544
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Commit: [47/91] c4165cc8bf79c3f96912e8210b3bb3565add288f (bonzini/rhel-qemu-kvm)
|
||
|
|
|
||
|
|
Running "install_headers" in the Linux source tree is fairly
|
||
|
|
unfriendly as out-of-tree builds will start complaining about the
|
||
|
|
kernel source being non-pristine. As we have a temporary directory for
|
||
|
|
the install we should also do the build step here. So now we have:
|
||
|
|
|
||
|
|
$tmpdir/
|
||
|
|
$blddir/
|
||
|
|
$hdrdir/
|
||
|
|
|
||
|
|
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
|
||
|
|
Message-Id: <20240514174253.694591-3-alex.bennee@linaro.org>
|
||
|
|
(cherry picked from commit b51ddd937f11f76614d4b36d14d8778df242661c)
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
---
|
||
|
|
scripts/update-linux-headers.sh | 80 +++++++++++++++++----------------
|
||
|
|
1 file changed, 41 insertions(+), 39 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
|
||
|
|
index 5f20434d5c..4431ba4d54 100755
|
||
|
|
--- a/scripts/update-linux-headers.sh
|
||
|
|
+++ b/scripts/update-linux-headers.sh
|
||
|
|
@@ -27,6 +27,8 @@
|
||
|
|
# types like "__u64". This work is done in the cp_portable function.
|
||
|
|
|
||
|
|
tmpdir=$(mktemp -d)
|
||
|
|
+hdrdir="$tmpdir/headers"
|
||
|
|
+blddir="$tmpdir/build"
|
||
|
|
linux="$1"
|
||
|
|
output="$2"
|
||
|
|
|
||
|
|
@@ -111,56 +113,56 @@ for arch in $ARCHLIST; do
|
||
|
|
arch_var=ARCH
|
||
|
|
fi
|
||
|
|
|
||
|
|
- make -C "$linux" INSTALL_HDR_PATH="$tmpdir" $arch_var=$arch headers_install
|
||
|
|
+ make -C "$linux" O="$blddir" INSTALL_HDR_PATH="$hdrdir" $arch_var=$arch headers_install
|
||
|
|
|
||
|
|
rm -rf "$output/linux-headers/asm-$arch"
|
||
|
|
mkdir -p "$output/linux-headers/asm-$arch"
|
||
|
|
for header in kvm.h unistd.h bitsperlong.h mman.h; do
|
||
|
|
- cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
|
||
|
|
+ cp "$hdrdir/include/asm/$header" "$output/linux-headers/asm-$arch"
|
||
|
|
done
|
||
|
|
|
||
|
|
if [ $arch = mips ]; then
|
||
|
|
- cp "$tmpdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd_o32.h" "$output/linux-headers/asm-mips/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd_n32.h" "$output/linux-headers/asm-mips/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd_n64.h" "$output/linux-headers/asm-mips/"
|
||
|
|
+ cp "$hdrdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_o32.h" "$output/linux-headers/asm-mips/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_n32.h" "$output/linux-headers/asm-mips/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_n64.h" "$output/linux-headers/asm-mips/"
|
||
|
|
fi
|
||
|
|
if [ $arch = powerpc ]; then
|
||
|
|
- cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-powerpc/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-powerpc/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-powerpc/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-powerpc/"
|
||
|
|
fi
|
||
|
|
|
||
|
|
rm -rf "$output/include/standard-headers/asm-$arch"
|
||
|
|
mkdir -p "$output/include/standard-headers/asm-$arch"
|
||
|
|
if [ $arch = s390 ]; then
|
||
|
|
- cp_portable "$tmpdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s390/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s390/"
|
||
|
|
+ cp_portable "$hdrdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s390/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s390/"
|
||
|
|
fi
|
||
|
|
if [ $arch = arm ]; then
|
||
|
|
- cp "$tmpdir/include/asm/unistd-eabi.h" "$output/linux-headers/asm-arm/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd-oabi.h" "$output/linux-headers/asm-arm/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd-common.h" "$output/linux-headers/asm-arm/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd-eabi.h" "$output/linux-headers/asm-arm/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd-oabi.h" "$output/linux-headers/asm-arm/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd-common.h" "$output/linux-headers/asm-arm/"
|
||
|
|
fi
|
||
|
|
if [ $arch = arm64 ]; then
|
||
|
|
- cp "$tmpdir/include/asm/sve_context.h" "$output/linux-headers/asm-arm64/"
|
||
|
|
+ cp "$hdrdir/include/asm/sve_context.h" "$output/linux-headers/asm-arm64/"
|
||
|
|
fi
|
||
|
|
if [ $arch = x86 ]; then
|
||
|
|
- cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
|
||
|
|
- cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
|
||
|
|
- cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
|
||
|
|
+ cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
|
||
|
|
+ cp_portable "$hdrdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"
|
||
|
|
# Remove everything except the macros from bootparam.h avoiding the
|
||
|
|
# unnecessary import of several video/ist/etc headers
|
||
|
|
sed -e '/__ASSEMBLY__/,/__ASSEMBLY__/d' \
|
||
|
|
- "$tmpdir/include/asm/bootparam.h" > "$tmpdir/bootparam.h"
|
||
|
|
- cp_portable "$tmpdir/bootparam.h" \
|
||
|
|
+ "$hdrdir/include/asm/bootparam.h" > "$hdrdir/bootparam.h"
|
||
|
|
+ cp_portable "$hdrdir/bootparam.h" \
|
||
|
|
"$output/include/standard-headers/asm-$arch"
|
||
|
|
- cp_portable "$tmpdir/include/asm/setup_data.h" \
|
||
|
|
+ cp_portable "$hdrdir/include/asm/setup_data.h" \
|
||
|
|
"$output/standard-headers/asm-x86"
|
||
|
|
fi
|
||
|
|
if [ $arch = riscv ]; then
|
||
|
|
- cp "$tmpdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/"
|
||
|
|
+ cp "$hdrdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/"
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
arch=
|
||
|
|
@@ -170,13 +172,13 @@ mkdir -p "$output/linux-headers/linux"
|
||
|
|
for header in const.h stddef.h kvm.h vfio.h vfio_ccw.h vfio_zdev.h vhost.h \
|
||
|
|
psci.h psp-sev.h userfaultfd.h memfd.h mman.h nvme_ioctl.h \
|
||
|
|
vduse.h iommufd.h bits.h; do
|
||
|
|
- cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
|
||
|
|
+ cp "$hdrdir/include/linux/$header" "$output/linux-headers/linux"
|
||
|
|
done
|
||
|
|
|
||
|
|
rm -rf "$output/linux-headers/asm-generic"
|
||
|
|
mkdir -p "$output/linux-headers/asm-generic"
|
||
|
|
for header in unistd.h bitsperlong.h mman-common.h mman.h hugetlb_encode.h; do
|
||
|
|
- cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
|
||
|
|
+ cp "$hdrdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
|
||
|
|
done
|
||
|
|
|
||
|
|
if [ -L "$linux/source" ]; then
|
||
|
|
@@ -211,23 +213,23 @@ EOF
|
||
|
|
|
||
|
|
rm -rf "$output/include/standard-headers/linux"
|
||
|
|
mkdir -p "$output/include/standard-headers/linux"
|
||
|
|
-for i in "$tmpdir"/include/linux/*virtio*.h \
|
||
|
|
- "$tmpdir/include/linux/qemu_fw_cfg.h" \
|
||
|
|
- "$tmpdir/include/linux/fuse.h" \
|
||
|
|
- "$tmpdir/include/linux/input.h" \
|
||
|
|
- "$tmpdir/include/linux/input-event-codes.h" \
|
||
|
|
- "$tmpdir/include/linux/udmabuf.h" \
|
||
|
|
- "$tmpdir/include/linux/pci_regs.h" \
|
||
|
|
- "$tmpdir/include/linux/ethtool.h" \
|
||
|
|
- "$tmpdir/include/linux/const.h" \
|
||
|
|
- "$tmpdir/include/linux/kernel.h" \
|
||
|
|
- "$tmpdir/include/linux/vhost_types.h" \
|
||
|
|
- "$tmpdir/include/linux/sysinfo.h" \
|
||
|
|
- "$tmpdir/include/misc/pvpanic.h"; do
|
||
|
|
+for i in "$hdrdir"/include/linux/*virtio*.h \
|
||
|
|
+ "$hdrdir/include/linux/qemu_fw_cfg.h" \
|
||
|
|
+ "$hdrdir/include/linux/fuse.h" \
|
||
|
|
+ "$hdrdir/include/linux/input.h" \
|
||
|
|
+ "$hdrdir/include/linux/input-event-codes.h" \
|
||
|
|
+ "$hdrdir/include/linux/udmabuf.h" \
|
||
|
|
+ "$hdrdir/include/linux/pci_regs.h" \
|
||
|
|
+ "$hdrdir/include/linux/ethtool.h" \
|
||
|
|
+ "$hdrdir/include/linux/const.h" \
|
||
|
|
+ "$hdrdir/include/linux/kernel.h" \
|
||
|
|
+ "$hdrdir/include/linux/vhost_types.h" \
|
||
|
|
+ "$hdrdir/include/linux/sysinfo.h" \
|
||
|
|
+ "$hdrdir/include/misc/pvpanic.h"; do
|
||
|
|
cp_portable "$i" "$output/include/standard-headers/linux"
|
||
|
|
done
|
||
|
|
mkdir -p "$output/include/standard-headers/drm"
|
||
|
|
-cp_portable "$tmpdir/include/drm/drm_fourcc.h" \
|
||
|
|
+cp_portable "$hdrdir/include/drm/drm_fourcc.h" \
|
||
|
|
"$output/include/standard-headers/drm"
|
||
|
|
|
||
|
|
rm -rf "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|