diff options
Diffstat (limited to 'meta/recipes-connectivity/iproute2')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch | 24 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb | 12 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_6.7.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2.inc) | 65 |
3 files changed, 45 insertions, 56 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch deleted file mode 100644 index fdd8bbfb3c..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From ce39396d4617874323f6039a5b476e44bf552908 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sat, 6 Jun 2020 18:00:13 +0000 | ||
4 | Subject: [PATCH] devlink.c: add missing include | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | devlink/devlink.c | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/devlink/devlink.c b/devlink/devlink.c | ||
14 | index 0982fae..93dc01c 100644 | ||
15 | --- a/devlink/devlink.c | ||
16 | +++ b/devlink/devlink.c | ||
17 | @@ -33,6 +33,7 @@ | ||
18 | #include <sys/select.h> | ||
19 | #include <sys/socket.h> | ||
20 | #include <sys/types.h> | ||
21 | +#include <signal.h> | ||
22 | |||
23 | #include "version.h" | ||
24 | #include "list.h" | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb deleted file mode 100644 index 3a590f9122..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb +++ /dev/null | |||
@@ -1,12 +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 | file://0001-devlink.c-add-missing-include.patch \ | ||
6 | " | ||
7 | |||
8 | SRC_URI[sha256sum] = "cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e" | ||
9 | |||
10 | # CFLAGS are computed in Makefile and reference CCOPTS | ||
11 | # | ||
12 | EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2_6.7.0.bb index 403d264308..8c460adf73 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2_6.7.0.bb | |||
@@ -5,31 +5,43 @@ 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 | file://0001-libc-compat.h-add-musl-workaround.patch \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[sha256sum] = "ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d" | ||
15 | 19 | ||
16 | CLEANBROKEN = "1" | 20 | inherit update-alternatives bash-completion pkgconfig |
17 | 21 | ||
18 | PACKAGECONFIG ??= "tipc elf devlink" | 22 | PACKAGECONFIG ??= "tipc elf devlink" |
19 | PACKAGECONFIG[tipc] = ",,libmnl," | 23 | PACKAGECONFIG[tipc] = ",,libmnl," |
20 | PACKAGECONFIG[elf] = ",,elfutils," | 24 | PACKAGECONFIG[elf] = ",,elfutils," |
21 | PACKAGECONFIG[devlink] = ",,libmnl," | 25 | PACKAGECONFIG[devlink] = ",,libmnl," |
26 | PACKAGECONFIG[rdma] = ",,libmnl," | ||
27 | PACKAGECONFIG[selinux] = ",,libselinux" | ||
28 | |||
29 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" | ||
22 | 30 | ||
31 | # CFLAGS are computed in Makefile and reference CCOPTS | ||
32 | # | ||
23 | EXTRA_OEMAKE = "\ | 33 | EXTRA_OEMAKE = "\ |
24 | CC='${CC}' \ | 34 | CC='${CC}' \ |
25 | KERNEL_INCLUDE=${STAGING_INCDIR} \ | 35 | KERNEL_INCLUDE=${STAGING_INCDIR} \ |
26 | DOCDIR=${docdir}/iproute2 \ | 36 | DOCDIR=${docdir}/iproute2 \ |
27 | SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ | 37 | SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \ |
28 | SBINDIR='${base_sbindir}' \ | 38 | SBINDIR='${base_sbindir}' \ |
39 | CONF_USR_DIR='${libdir}/iproute2' \ | ||
29 | LIBDIR='${libdir}' \ | 40 | LIBDIR='${libdir}' \ |
41 | CCOPTS='${CFLAGS}' \ | ||
30 | " | 42 | " |
31 | 43 | ||
32 | do_configure_append () { | 44 | do_configure:append () { |
33 | sh configure ${STAGING_INCDIR} | 45 | sh configure ${STAGING_INCDIR} |
34 | # Explicitly disable ATM support | 46 | # Explicitly disable ATM support |
35 | sed -i -e '/TC_CONFIG_ATM/d' config.mk | 47 | sed -i -e '/TC_CONFIG_ATM/d' config.mk |
@@ -44,38 +56,51 @@ do_install () { | |||
44 | } | 56 | } |
45 | 57 | ||
46 | # The .so files in iproute2-tc are modules, not traditional libraries | 58 | # The .so files in iproute2-tc are modules, not traditional libraries |
47 | INSANE_SKIP_${PN}-tc = "dev-so" | 59 | INSANE_SKIP:${PN}-tc = "dev-so" |
48 | 60 | ||
49 | PACKAGES =+ "\ | 61 | IPROUTE2_PACKAGES =+ "\ |
62 | ${PN}-bridge \ | ||
50 | ${PN}-devlink \ | 63 | ${PN}-devlink \ |
51 | ${PN}-genl \ | 64 | ${PN}-genl \ |
52 | ${PN}-ifstat \ | 65 | ${PN}-ifstat \ |
66 | ${PN}-ip \ | ||
53 | ${PN}-lnstat \ | 67 | ${PN}-lnstat \ |
54 | ${PN}-nstat \ | 68 | ${PN}-nstat \ |
69 | ${PN}-routel \ | ||
55 | ${PN}-rtacct \ | 70 | ${PN}-rtacct \ |
56 | ${PN}-ss \ | 71 | ${PN}-ss \ |
57 | ${PN}-tc \ | 72 | ${PN}-tc \ |
58 | ${PN}-tipc \ | 73 | ${PN}-tipc \ |
74 | ${PN}-rdma \ | ||
59 | " | 75 | " |
60 | 76 | ||
61 | FILES_${PN}-tc = "${base_sbindir}/tc* \ | 77 | PACKAGE_BEFORE_PN = "${IPROUTE2_PACKAGES}" |
78 | RDEPENDS:${PN} += "${PN}-ip" | ||
79 | |||
80 | FILES:${PN}-tc = "${base_sbindir}/tc* \ | ||
62 | ${libdir}/tc/*.so" | 81 | ${libdir}/tc/*.so" |
63 | FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ | 82 | FILES:${PN}-lnstat = "${base_sbindir}/lnstat \ |
64 | ${base_sbindir}/ctstat \ | 83 | ${base_sbindir}/ctstat \ |
65 | ${base_sbindir}/rtstat" | 84 | ${base_sbindir}/rtstat" |
66 | FILES_${PN}-ifstat = "${base_sbindir}/ifstat" | 85 | FILES:${PN}-ifstat = "${base_sbindir}/ifstat" |
67 | FILES_${PN}-genl = "${base_sbindir}/genl" | 86 | FILES:${PN}-ip = "${base_sbindir}/ip.* ${libdir}/iproute2" |
68 | FILES_${PN}-rtacct = "${base_sbindir}/rtacct" | 87 | FILES:${PN}-genl = "${base_sbindir}/genl" |
69 | FILES_${PN}-nstat = "${base_sbindir}/nstat" | 88 | FILES:${PN}-rtacct = "${base_sbindir}/rtacct" |
70 | FILES_${PN}-ss = "${base_sbindir}/ss" | 89 | FILES:${PN}-nstat = "${base_sbindir}/nstat" |
71 | FILES_${PN}-tipc = "${base_sbindir}/tipc" | 90 | FILES:${PN}-ss = "${base_sbindir}/ss" |
72 | FILES_${PN}-devlink = "${base_sbindir}/devlink" | 91 | FILES:${PN}-tipc = "${base_sbindir}/tipc" |
73 | 92 | FILES:${PN}-devlink = "${base_sbindir}/devlink" | |
74 | ALTERNATIVE_${PN} = "ip" | 93 | FILES:${PN}-rdma = "${base_sbindir}/rdma" |
94 | FILES:${PN}-routel = "${base_sbindir}/routel" | ||
95 | FILES:${PN}-bridge = "${base_sbindir}/bridge" | ||
96 | |||
97 | RDEPENDS:${PN}-routel = "python3-core" | ||
98 | |||
99 | ALTERNATIVE:${PN}-ip = "ip" | ||
75 | ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" | 100 | ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" |
76 | ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" | 101 | ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" |
77 | ALTERNATIVE_PRIORITY = "100" | 102 | ALTERNATIVE_PRIORITY = "100" |
78 | 103 | ||
79 | ALTERNATIVE_${PN}-tc = "tc" | 104 | ALTERNATIVE:${PN}-tc = "tc" |
80 | ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc" | 105 | ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc" |
81 | ALTERNATIVE_PRIORITY_${PN}-tc = "100" | 106 | ALTERNATIVE_PRIORITY_${PN}-tc = "100" |