diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-08-28 15:41:10 -0400 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-08-29 09:06:54 -0700 |
| commit | 383e8bee87f446eaae5cec2477ebeff6f30b72e4 (patch) | |
| tree | 2d034214061643ebb8e68f860f70c76e609d9ca8 /meta-networking/recipes-support | |
| parent | 62bccf32639f17827f7b477648bfb4240520c527 (diff) | |
| download | meta-openembedded-contrib-383e8bee87f446eaae5cec2477ebeff6f30b72e4.tar.gz | |
dnsmasq: fix build against 5.2 headers
Upstream linux y2038 work has moved some definitions SIOCGSTAMP is
defined in linux/sockios.h, not asm/sockios.h now. So we need to
add that include to fix the build.
Upstream-status: backport of http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=3052ce208acf602f0163166dcefb7330d537cedb
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support')
| -rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch | 31 | ||||
| -rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch new file mode 100644 index 0000000000..844a709856 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch @@ -0,0 +1,31 @@ +From 52f4b58c14a2788ca08b7d8884d586724d86fc66 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 19 Aug 2019 14:46:02 +0000 +Subject: [PATCH] dnsmasq: fix build against 5.2 headers + +Upstream linux y2038 work has moved some definitions SIOCGSTAMP is +defined in linux/sockios.h, not asm/sockios.h now. So we need to +add that include to fix the build. + +Upstream-status: backport of http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=3052ce208acf602f0163166dcefb7330d537cedb + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + a/src/dnsmasq.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h b/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h +index f53e9a5be6..d9225ea473 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -138,6 +138,7 @@ typedef unsigned long long u64; + #endif + + #if defined(HAVE_LINUX_NETWORK) ++#include <linux/sockios.h> + #include <linux/capability.h> + /* There doesn't seem to be a universally-available + userspace header for these. */ +-- +2.19.1 + diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb index fdbdefbadc..6f3d5daa62 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb @@ -4,5 +4,6 @@ SRC_URI[dnsmasq-2.80.md5sum] = "1f071fd11454e1cffea73bdadcf70b21" SRC_URI[dnsmasq-2.80.sha256sum] = "9e4a58f816ce0033ce383c549b7d4058ad9b823968d352d2b76614f83ea39adc" SRC_URI += "\ file://lua.patch \ + file://0001-dnsmasq-fix-build-against-5.2-headers.patch \ " |