diff options
| author | Jason Baron <jbaron@akamai.com> | 2018-03-07 22:25:39 -0500 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2018-03-13 23:09:49 +0200 |
| commit | d3b7b37445503699c99a182506d0bc70f6e1e572 (patch) | |
| tree | e4eef4ee7e3244b7a5219430da850c566fa1045d /scripts | |
| parent | 026aaf47c02b79036feb830206cfebb2a726510d (diff) | |
scripts/update-linux-headers: add ethtool.h and update to 4.16.0-rc4
A subsequent patch to add support for setting linkspeed/duplex in
virtio-net, requires a few definitions from ethtool.h, which ends up
pulling in kernel.h and sysinfo.h as well.
Signed-off-by: Jason Baron <jbaron@akamai.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: virtio-dev@lists.oasis-open.org
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/update-linux-headers.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index be065704df..d18e2f1ffa 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -39,6 +39,9 @@ cp_portable() { -e 'input-event-codes' \ -e 'sys/' \ -e 'pvrdma_verbs' \ + -e 'limits' \ + -e 'linux/kernel' \ + -e 'linux/sysinfo' \ > /dev/null then echo "Unexpected #include in input file $f". @@ -59,6 +62,10 @@ cp_portable() { -e '/sys\/ioctl.h/d' \ -e 's/SW_MAX/SW_MAX_/' \ -e 's/atomic_t/int/' \ + -e 's/__kernel_long_t/long/' \ + -e 's/__kernel_ulong_t/unsigned long/' \ + -e 's/struct ethhdr/struct eth_header/' \ + -e '/\#define _LINUX_ETHTOOL_H/a \\n\#include "net/eth.h"' \ "$f" > "$to/$header"; } @@ -146,7 +153,9 @@ 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/input.h" \ "$tmpdir/include/linux/input-event-codes.h" \ - "$tmpdir/include/linux/pci_regs.h"; do + "$tmpdir/include/linux/pci_regs.h" \ + "$tmpdir/include/linux/ethtool.h" "$tmpdir/include/linux/kernel.h" \ + "$tmpdir/include/linux/sysinfo.h"; do cp_portable "$i" "$output/include/standard-headers/linux" done |