49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
|
From: Eric Farman <farman@linux.ibm.com>
|
||
|
Date: Mon, 4 Jan 2021 21:20:55 +0100
|
||
|
Subject: update-linux-headers: Include const.h
|
||
|
MIME-Version: 1.0
|
||
|
Content-Type: text/plain; charset=UTF-8
|
||
|
Content-Transfer-Encoding: 8bit
|
||
|
|
||
|
Git-commit: ab5ec23f9cc25215c1281d575c07c0f35e8e9e26
|
||
|
References: bsc#1183634
|
||
|
|
||
|
Kernel commit a85cbe6159ff ("uapi: move constants from
|
||
|
<linux/kernel.h> to <linux/const.h>") breaks our script
|
||
|
because of the unrecognized include. Let's add that to
|
||
|
our processing.
|
||
|
|
||
|
Signed-off-by: Eric Farman <farman@linux.ibm.com>
|
||
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
||
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
Message-Id: <20210104202057.48048-2-farman@linux.ibm.com>
|
||
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
---
|
||
|
scripts/update-linux-headers.sh | 5 ++++-
|
||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
||
|
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
|
||
|
index 9efbaf2f84b38bee183517934b84..fa6f2b6272b78223d28f4c823858 100755
|
||
|
--- a/scripts/update-linux-headers.sh
|
||
|
+++ b/scripts/update-linux-headers.sh
|
||
|
@@ -41,6 +41,7 @@ cp_portable() {
|
||
|
-e 'pvrdma_verbs' \
|
||
|
-e 'drm.h' \
|
||
|
-e 'limits' \
|
||
|
+ -e 'linux/const' \
|
||
|
-e 'linux/kernel' \
|
||
|
-e 'linux/sysinfo' \
|
||
|
-e 'asm-generic/kvm_para' \
|
||
|
@@ -190,7 +191,9 @@ for i in "$tmpdir"/include/linux/*virtio*.h \
|
||
|
"$tmpdir/include/linux/input.h" \
|
||
|
"$tmpdir/include/linux/input-event-codes.h" \
|
||
|
"$tmpdir/include/linux/pci_regs.h" \
|
||
|
- "$tmpdir/include/linux/ethtool.h" "$tmpdir/include/linux/kernel.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"; do
|
||
|
cp_portable "$i" "$output/include/standard-headers/linux"
|