On Mon, Jan 04, 2021 at 09:20:55PM +0100, Eric Farman wrote: > 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 <far...@linux.ibm.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 9efbaf2f84..fa6f2b6272 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" > -- > 2.17.1
So I think I came to the same change when trying to update the headers. :) Reviewed-by: Peter Xu <pet...@redhat.com> Could I ask why the const.h is installed into include/standard-headers/linux rather than linux-headers/linux? When I was working on my version I failed to figure out the difference. One answer is ethtool.h is there which included const.h, but I guess that's not the real one. Thanks, -- Peter Xu