diff options
author | Changhyeok Bae <changhyeok.bae@gmail.com> | 2022-09-25 14:34:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-28 08:01:10 +0100 |
commit | 9e35a40cf063af9420ee78f9d327c910d527dc1d (patch) | |
tree | 1314c2b496b6ce6b843c1728b3b889b31f79cd9e /meta/recipes-connectivity/iproute2 | |
parent | 2d38db22fa30750c723ed3c06176e4b28c5140ca (diff) | |
download | poky-9e35a40cf063af9420ee78f9d327c910d527dc1d.tar.gz |
iproute2: merge .inc into .bb
(From OE-Core rev: 368e01b2eae6ff55293b3bdbeea4b1612063f8ca)
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2.inc | 89 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb | 91 |
2 files changed, 89 insertions, 91 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc deleted file mode 100644 index c292b95e36..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | SUMMARY = "TCP / IP networking and traffic control utilities" | ||
2 | DESCRIPTION = "Iproute2 is a collection of utilities for controlling \ | ||
3 | TCP / IP networking and traffic control in Linux. Of the utilities ip \ | ||
4 | and tc are the most important. ip controls IPv4 and IPv6 \ | ||
5 | configuration and tc stands for traffic control." | ||
6 | HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" | ||
7 | SECTION = "base" | ||
8 | LICENSE = "GPL-2.0-or-later" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | ||
10 | file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" | ||
11 | |||
12 | DEPENDS = "flex-native bison-native iptables libcap" | ||
13 | |||
14 | inherit update-alternatives bash-completion pkgconfig | ||
15 | |||
16 | PACKAGECONFIG ??= "tipc elf devlink" | ||
17 | PACKAGECONFIG[tipc] = ",,libmnl," | ||
18 | PACKAGECONFIG[elf] = ",,elfutils," | ||
19 | PACKAGECONFIG[devlink] = ",,libmnl," | ||
20 | PACKAGECONFIG[rdma] = ",,libmnl," | ||
21 | |||
22 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" | ||
23 | |||
24 | EXTRA_OEMAKE = "\ | ||
25 | CC='${CC}' \ | ||
26 | KERNEL_INCLUDE=${STAGING_INCDIR} \ | ||
27 | DOCDIR=${docdir}/iproute2 \ | ||
28 | SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \ | ||
29 | SBINDIR='${base_sbindir}' \ | ||
30 | LIBDIR='${libdir}' \ | ||
31 | " | ||
32 | |||
33 | do_configure:append () { | ||
34 | sh configure ${STAGING_INCDIR} | ||
35 | # Explicitly disable ATM support | ||
36 | sed -i -e '/TC_CONFIG_ATM/d' config.mk | ||
37 | } | ||
38 | |||
39 | do_install () { | ||
40 | oe_runmake DESTDIR=${D} install | ||
41 | mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2 | ||
42 | install -d ${D}${datadir} | ||
43 | mv ${D}/share/* ${D}${datadir}/ || true | ||
44 | rm ${D}/share -rf || true | ||
45 | } | ||
46 | |||
47 | # The .so files in iproute2-tc are modules, not traditional libraries | ||
48 | INSANE_SKIP:${PN}-tc = "dev-so" | ||
49 | |||
50 | IPROUTE2_PACKAGES =+ "\ | ||
51 | ${PN}-devlink \ | ||
52 | ${PN}-genl \ | ||
53 | ${PN}-ifstat \ | ||
54 | ${PN}-ip \ | ||
55 | ${PN}-lnstat \ | ||
56 | ${PN}-nstat \ | ||
57 | ${PN}-rtacct \ | ||
58 | ${PN}-ss \ | ||
59 | ${PN}-tc \ | ||
60 | ${PN}-tipc \ | ||
61 | ${PN}-rdma \ | ||
62 | " | ||
63 | |||
64 | PACKAGE_BEFORE_PN = "${IPROUTE2_PACKAGES}" | ||
65 | RDEPENDS:${PN} += "${PN}-ip" | ||
66 | |||
67 | FILES:${PN}-tc = "${base_sbindir}/tc* \ | ||
68 | ${libdir}/tc/*.so" | ||
69 | FILES:${PN}-lnstat = "${base_sbindir}/lnstat \ | ||
70 | ${base_sbindir}/ctstat \ | ||
71 | ${base_sbindir}/rtstat" | ||
72 | FILES:${PN}-ifstat = "${base_sbindir}/ifstat" | ||
73 | FILES:${PN}-ip = "${base_sbindir}/ip.${PN} ${sysconfdir}/iproute2" | ||
74 | FILES:${PN}-genl = "${base_sbindir}/genl" | ||
75 | FILES:${PN}-rtacct = "${base_sbindir}/rtacct" | ||
76 | FILES:${PN}-nstat = "${base_sbindir}/nstat" | ||
77 | FILES:${PN}-ss = "${base_sbindir}/ss" | ||
78 | FILES:${PN}-tipc = "${base_sbindir}/tipc" | ||
79 | FILES:${PN}-devlink = "${base_sbindir}/devlink" | ||
80 | FILES:${PN}-rdma = "${base_sbindir}/rdma" | ||
81 | |||
82 | ALTERNATIVE:${PN}-ip = "ip" | ||
83 | ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" | ||
84 | ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" | ||
85 | ALTERNATIVE_PRIORITY = "100" | ||
86 | |||
87 | ALTERNATIVE:${PN}-tc = "tc" | ||
88 | ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc" | ||
89 | ALTERNATIVE_PRIORITY_${PN}-tc = "100" | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb index 6a007797c9..3cbf80a810 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb | |||
@@ -1,4 +1,15 @@ | |||
1 | require iproute2.inc | 1 | SUMMARY = "TCP / IP networking and traffic control utilities" |
2 | DESCRIPTION = "Iproute2 is a collection of utilities for controlling \ | ||
3 | TCP / IP networking and traffic control in Linux. Of the utilities ip \ | ||
4 | and tc are the most important. ip controls IPv4 and IPv6 \ | ||
5 | configuration and tc stands for traffic control." | ||
6 | HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" | ||
7 | SECTION = "base" | ||
8 | LICENSE = "GPL-2.0-or-later" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | ||
10 | file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" | ||
11 | |||
12 | DEPENDS = "flex-native bison-native iptables libcap" | ||
2 | 13 | ||
3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | 14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ |
4 | file://0001-libc-compat.h-add-musl-workaround.patch \ | 15 | file://0001-libc-compat.h-add-musl-workaround.patch \ |
@@ -8,6 +19,82 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | |||
8 | 19 | ||
9 | SRC_URI[sha256sum] = "26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791" | 20 | SRC_URI[sha256sum] = "26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791" |
10 | 21 | ||
22 | inherit update-alternatives bash-completion pkgconfig | ||
23 | |||
24 | PACKAGECONFIG ??= "tipc elf devlink" | ||
25 | PACKAGECONFIG[tipc] = ",,libmnl," | ||
26 | PACKAGECONFIG[elf] = ",,elfutils," | ||
27 | PACKAGECONFIG[devlink] = ",,libmnl," | ||
28 | PACKAGECONFIG[rdma] = ",,libmnl," | ||
29 | |||
30 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" | ||
31 | |||
11 | # CFLAGS are computed in Makefile and reference CCOPTS | 32 | # CFLAGS are computed in Makefile and reference CCOPTS |
12 | # | 33 | # |
13 | EXTRA_OEMAKE:append = " CCOPTS='${CFLAGS}'" | 34 | EXTRA_OEMAKE = "\ |
35 | CC='${CC}' \ | ||
36 | KERNEL_INCLUDE=${STAGING_INCDIR} \ | ||
37 | DOCDIR=${docdir}/iproute2 \ | ||
38 | SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \ | ||
39 | SBINDIR='${base_sbindir}' \ | ||
40 | LIBDIR='${libdir}' \ | ||
41 | CCOPTS='${CFLAGS}' \ | ||
42 | " | ||
43 | |||
44 | do_configure:append () { | ||
45 | sh configure ${STAGING_INCDIR} | ||
46 | # Explicitly disable ATM support | ||
47 | sed -i -e '/TC_CONFIG_ATM/d' config.mk | ||
48 | } | ||
49 | |||
50 | do_install () { | ||
51 | oe_runmake DESTDIR=${D} install | ||
52 | mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2 | ||
53 | install -d ${D}${datadir} | ||
54 | mv ${D}/share/* ${D}${datadir}/ || true | ||
55 | rm ${D}/share -rf || true | ||
56 | } | ||
57 | |||
58 | # The .so files in iproute2-tc are modules, not traditional libraries | ||
59 | INSANE_SKIP:${PN}-tc = "dev-so" | ||
60 | |||
61 | IPROUTE2_PACKAGES =+ "\ | ||
62 | ${PN}-devlink \ | ||
63 | ${PN}-genl \ | ||
64 | ${PN}-ifstat \ | ||
65 | ${PN}-ip \ | ||
66 | ${PN}-lnstat \ | ||
67 | ${PN}-nstat \ | ||
68 | ${PN}-rtacct \ | ||
69 | ${PN}-ss \ | ||
70 | ${PN}-tc \ | ||
71 | ${PN}-tipc \ | ||
72 | ${PN}-rdma \ | ||
73 | " | ||
74 | |||
75 | PACKAGE_BEFORE_PN = "${IPROUTE2_PACKAGES}" | ||
76 | RDEPENDS:${PN} += "${PN}-ip" | ||
77 | |||
78 | FILES:${PN}-tc = "${base_sbindir}/tc* \ | ||
79 | ${libdir}/tc/*.so" | ||
80 | FILES:${PN}-lnstat = "${base_sbindir}/lnstat \ | ||
81 | ${base_sbindir}/ctstat \ | ||
82 | ${base_sbindir}/rtstat" | ||
83 | FILES:${PN}-ifstat = "${base_sbindir}/ifstat" | ||
84 | FILES:${PN}-ip = "${base_sbindir}/ip.${PN} ${sysconfdir}/iproute2" | ||
85 | FILES:${PN}-genl = "${base_sbindir}/genl" | ||
86 | FILES:${PN}-rtacct = "${base_sbindir}/rtacct" | ||
87 | FILES:${PN}-nstat = "${base_sbindir}/nstat" | ||
88 | FILES:${PN}-ss = "${base_sbindir}/ss" | ||
89 | FILES:${PN}-tipc = "${base_sbindir}/tipc" | ||
90 | FILES:${PN}-devlink = "${base_sbindir}/devlink" | ||
91 | FILES:${PN}-rdma = "${base_sbindir}/rdma" | ||
92 | |||
93 | ALTERNATIVE:${PN}-ip = "ip" | ||
94 | ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" | ||
95 | ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" | ||
96 | ALTERNATIVE_PRIORITY = "100" | ||
97 | |||
98 | ALTERNATIVE:${PN}-tc = "tc" | ||
99 | ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc" | ||
100 | ALTERNATIVE_PRIORITY_${PN}-tc = "100" | ||