diff options
Diffstat (limited to 'meta/recipes-connectivity/iproute2')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch | 39 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.11.0.bb | 11 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2.inc) | 58 |
3 files changed, 37 insertions, 71 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch deleted file mode 100644 index 74e3de1ce9..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From c25f8d1f7a6203dfeb10b39f80ffd314bb84a58d Mon Sep 17 00:00:00 2001 | ||
2 | From: Baruch Siach <baruch@tkos.co.il> | ||
3 | Date: Thu, 22 Dec 2016 15:26:30 +0200 | ||
4 | Subject: [PATCH] libc-compat.h: add musl workaround | ||
5 | |||
6 | The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and | ||
7 | __USE_MISC) to solve conflicts with libc provided headers. This patch makes | ||
8 | libc-compat.h work for musl libc as well. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Taken From: | ||
13 | https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch | ||
14 | |||
15 | Signed-off-by: Baruch Siach <baruch@tkos.co.il> | ||
16 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
17 | |||
18 | --- | ||
19 | include/uapi/linux/libc-compat.h | 4 +++- | ||
20 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h | ||
23 | index a159991..22198fa 100644 | ||
24 | --- a/include/uapi/linux/libc-compat.h | ||
25 | +++ b/include/uapi/linux/libc-compat.h | ||
26 | @@ -50,10 +50,12 @@ | ||
27 | #define _LIBC_COMPAT_H | ||
28 | |||
29 | /* We have included glibc headers... */ | ||
30 | -#if defined(__GLIBC__) | ||
31 | +#if 1 | ||
32 | +#define __USE_MISC | ||
33 | |||
34 | /* Coordinate with glibc net/if.h header. */ | ||
35 | #if defined(_NET_IF_H) && defined(__USE_MISC) | ||
36 | +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 | ||
37 | |||
38 | /* GLIBC headers included first so don't define anything | ||
39 | * that would already be defined. */ | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.11.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.11.0.bb deleted file mode 100644 index e27b42d232..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_5.11.0.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require iproute2.inc | ||
2 | |||
3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | ||
4 | file://0001-libc-compat.h-add-musl-workaround.patch \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[sha256sum] = "c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54" | ||
8 | |||
9 | # CFLAGS are computed in Makefile and reference CCOPTS | ||
10 | # | ||
11 | EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb index 6c8eea6799..68f7611943 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb | |||
@@ -5,34 +5,41 @@ and tc are the most important. ip controls IPv4 and IPv6 \ | |||
5 | configuration and tc stands for traffic control." | 5 | configuration and tc stands for traffic control." |
6 | HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" | 6 | HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" |
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | LICENSE = "GPLv2+" | 8 | LICENSE = "GPL-2.0-or-later" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ |
10 | file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" | 10 | " |
11 | 11 | ||
12 | DEPENDS = "flex-native bison-native iptables libcap" | 12 | DEPENDS = "flex-native bison-native iptables libcap" |
13 | 13 | ||
14 | inherit update-alternatives bash-completion pkgconfig | 14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz" |
15 | |||
16 | SRC_URI[sha256sum] = "03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce" | ||
15 | 17 | ||
16 | CLEANBROKEN = "1" | 18 | inherit update-alternatives bash-completion pkgconfig |
17 | 19 | ||
18 | PACKAGECONFIG ??= "tipc elf devlink" | 20 | PACKAGECONFIG ??= "tipc elf devlink" |
19 | PACKAGECONFIG[tipc] = ",,libmnl," | 21 | PACKAGECONFIG[tipc] = ",,libmnl," |
20 | PACKAGECONFIG[elf] = ",,elfutils," | 22 | PACKAGECONFIG[elf] = ",,elfutils," |
21 | PACKAGECONFIG[devlink] = ",,libmnl," | 23 | PACKAGECONFIG[devlink] = ",,libmnl," |
22 | PACKAGECONFIG[rdma] = ",,libmnl," | 24 | PACKAGECONFIG[rdma] = ",,libmnl," |
25 | PACKAGECONFIG[selinux] = ",,libselinux" | ||
23 | 26 | ||
24 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" | 27 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" |
25 | 28 | ||
29 | # CFLAGS are computed in Makefile and reference CCOPTS | ||
30 | # | ||
26 | EXTRA_OEMAKE = "\ | 31 | EXTRA_OEMAKE = "\ |
27 | CC='${CC}' \ | 32 | CC='${CC}' \ |
28 | KERNEL_INCLUDE=${STAGING_INCDIR} \ | 33 | KERNEL_INCLUDE=${STAGING_INCDIR} \ |
29 | DOCDIR=${docdir}/iproute2 \ | 34 | DOCDIR=${docdir}/iproute2 \ |
30 | SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \ | 35 | SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \ |
31 | SBINDIR='${base_sbindir}' \ | 36 | SBINDIR='${base_sbindir}' \ |
37 | CONF_USR_DIR='${libdir}/iproute2' \ | ||
32 | LIBDIR='${libdir}' \ | 38 | LIBDIR='${libdir}' \ |
39 | CCOPTS='${CFLAGS}' \ | ||
33 | " | 40 | " |
34 | 41 | ||
35 | do_configure_append () { | 42 | do_configure:append () { |
36 | sh configure ${STAGING_INCDIR} | 43 | sh configure ${STAGING_INCDIR} |
37 | # Explicitly disable ATM support | 44 | # Explicitly disable ATM support |
38 | sed -i -e '/TC_CONFIG_ATM/d' config.mk | 45 | sed -i -e '/TC_CONFIG_ATM/d' config.mk |
@@ -44,18 +51,23 @@ do_install () { | |||
44 | install -d ${D}${datadir} | 51 | install -d ${D}${datadir} |
45 | mv ${D}/share/* ${D}${datadir}/ || true | 52 | mv ${D}/share/* ${D}${datadir}/ || true |
46 | rm ${D}/share -rf || true | 53 | rm ${D}/share -rf || true |
54 | |||
55 | # Remove support fot ipt and xt in tc. So tc library directory is not needed. | ||
56 | rm ${D}${libdir}/tc -rf | ||
47 | } | 57 | } |
48 | 58 | ||
49 | # The .so files in iproute2-tc are modules, not traditional libraries | 59 | # The .so files in iproute2-tc are modules, not traditional libraries |
50 | INSANE_SKIP_${PN}-tc = "dev-so" | 60 | INSANE_SKIP:${PN}-tc = "dev-so" |
51 | 61 | ||
52 | IPROUTE2_PACKAGES =+ "\ | 62 | IPROUTE2_PACKAGES =+ "\ |
63 | ${PN}-bridge \ | ||
53 | ${PN}-devlink \ | 64 | ${PN}-devlink \ |
54 | ${PN}-genl \ | 65 | ${PN}-genl \ |
55 | ${PN}-ifstat \ | 66 | ${PN}-ifstat \ |
56 | ${PN}-ip \ | 67 | ${PN}-ip \ |
57 | ${PN}-lnstat \ | 68 | ${PN}-lnstat \ |
58 | ${PN}-nstat \ | 69 | ${PN}-nstat \ |
70 | ${PN}-routel \ | ||
59 | ${PN}-rtacct \ | 71 | ${PN}-rtacct \ |
60 | ${PN}-ss \ | 72 | ${PN}-ss \ |
61 | ${PN}-tc \ | 73 | ${PN}-tc \ |
@@ -64,28 +76,32 @@ IPROUTE2_PACKAGES =+ "\ | |||
64 | " | 76 | " |
65 | 77 | ||
66 | PACKAGE_BEFORE_PN = "${IPROUTE2_PACKAGES}" | 78 | PACKAGE_BEFORE_PN = "${IPROUTE2_PACKAGES}" |
67 | RDEPENDS_${PN} += "${PN}-ip" | 79 | RDEPENDS:${PN} += "${PN}-ip" |
68 | 80 | ||
69 | FILES_${PN}-tc = "${base_sbindir}/tc* \ | 81 | FILES:${PN}-tc = "${base_sbindir}/tc* \ |
70 | ${libdir}/tc/*.so" | 82 | ${libdir}/tc/*.so" |
71 | FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ | 83 | FILES:${PN}-lnstat = "${base_sbindir}/lnstat \ |
72 | ${base_sbindir}/ctstat \ | 84 | ${base_sbindir}/ctstat \ |
73 | ${base_sbindir}/rtstat" | 85 | ${base_sbindir}/rtstat" |
74 | FILES_${PN}-ifstat = "${base_sbindir}/ifstat" | 86 | FILES:${PN}-ifstat = "${base_sbindir}/ifstat" |
75 | FILES_${PN}-ip = "${base_sbindir}/ip.${PN} ${sysconfdir}/iproute2" | 87 | FILES:${PN}-ip = "${base_sbindir}/ip.* ${libdir}/iproute2" |
76 | FILES_${PN}-genl = "${base_sbindir}/genl" | 88 | FILES:${PN}-genl = "${base_sbindir}/genl" |
77 | FILES_${PN}-rtacct = "${base_sbindir}/rtacct" | 89 | FILES:${PN}-rtacct = "${base_sbindir}/rtacct" |
78 | FILES_${PN}-nstat = "${base_sbindir}/nstat" | 90 | FILES:${PN}-nstat = "${base_sbindir}/nstat" |
79 | FILES_${PN}-ss = "${base_sbindir}/ss" | 91 | FILES:${PN}-ss = "${base_sbindir}/ss" |
80 | FILES_${PN}-tipc = "${base_sbindir}/tipc" | 92 | FILES:${PN}-tipc = "${base_sbindir}/tipc" |
81 | FILES_${PN}-devlink = "${base_sbindir}/devlink" | 93 | FILES:${PN}-devlink = "${base_sbindir}/devlink" |
82 | FILES_${PN}-rdma = "${base_sbindir}/rdma" | 94 | FILES:${PN}-rdma = "${base_sbindir}/rdma" |
83 | 95 | FILES:${PN}-routel = "${base_sbindir}/routel" | |
84 | ALTERNATIVE_${PN}-ip = "ip" | 96 | FILES:${PN}-bridge = "${base_sbindir}/bridge" |
97 | |||
98 | RDEPENDS:${PN}-routel = "python3-core" | ||
99 | |||
100 | ALTERNATIVE:${PN}-ip = "ip" | ||
85 | ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" | 101 | ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" |
86 | ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" | 102 | ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" |
87 | ALTERNATIVE_PRIORITY = "100" | 103 | ALTERNATIVE_PRIORITY = "100" |
88 | 104 | ||
89 | ALTERNATIVE_${PN}-tc = "tc" | 105 | ALTERNATIVE:${PN}-tc = "tc" |
90 | ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc" | 106 | ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc" |
91 | ALTERNATIVE_PRIORITY_${PN}-tc = "100" | 107 | ALTERNATIVE_PRIORITY_${PN}-tc = "100" |