summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2017-08-15 15:38:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-17 00:21:14 +0100
commit24baa5c9daaef049b191a3ce592a70afb21af6c8 (patch)
tree8933c2ac881c2a35b4ce0f3b5292325696fc3157
parentc6b7d0907a26f2193e93eba36978414f82470cfc (diff)
downloadpoky-24baa5c9daaef049b191a3ce592a70afb21af6c8.tar.gz
iproute2: add tipc support
The tipcutils 2.2 in meta-oe removed the tipc-config tool and recommended to use the new configuration tool named "tipc" in iproute2 package for configuring the tipc, which utilizes the new tipc netlink kernel API. Add tipc support and split it out into its own package. (From OE-Core rev: 944ef0de241de77429ab0e5cb1dd4a7f355cf3fd) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index ce64888a05..57309b7aac 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -13,7 +13,10 @@ DEPENDS = "flex-native bison-native iptables elfutils"
13 13
14inherit update-alternatives bash-completion pkgconfig 14inherit update-alternatives bash-completion pkgconfig
15 15
16EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" 16PACKAGECONFIG ??= ""
17PACKAGECONFIG[tipc] = ",,libmnl,"
18
19EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
17 20
18do_configure_append () { 21do_configure_append () {
19 sh configure ${STAGING_INCDIR} 22 sh configure ${STAGING_INCDIR}
@@ -32,7 +35,7 @@ do_install () {
32# The .so files in iproute2-tc are modules, not traditional libraries 35# The .so files in iproute2-tc are modules, not traditional libraries
33INSANE_SKIP_${PN}-tc = "dev-so" 36INSANE_SKIP_${PN}-tc = "dev-so"
34 37
35PACKAGES =+ "${PN}-tc ${PN}-lnstat ${PN}-ifstat ${PN}-genl ${PN}-rtacct ${PN}-nstat ${PN}-ss" 38PACKAGES =+ "${PN}-tc ${PN}-lnstat ${PN}-ifstat ${PN}-genl ${PN}-rtacct ${PN}-nstat ${PN}-ss ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}"
36FILES_${PN}-tc = "${base_sbindir}/tc* \ 39FILES_${PN}-tc = "${base_sbindir}/tc* \
37 ${libdir}/tc/*.so" 40 ${libdir}/tc/*.so"
38FILES_${PN}-lnstat = "${base_sbindir}/lnstat ${base_sbindir}/ctstat ${base_sbindir}/rtstat" 41FILES_${PN}-lnstat = "${base_sbindir}/lnstat ${base_sbindir}/ctstat ${base_sbindir}/rtstat"
@@ -41,6 +44,7 @@ FILES_${PN}-genl = "${base_sbindir}/genl"
41FILES_${PN}-rtacct = "${base_sbindir}/rtacct" 44FILES_${PN}-rtacct = "${base_sbindir}/rtacct"
42FILES_${PN}-nstat = "${base_sbindir}/nstat" 45FILES_${PN}-nstat = "${base_sbindir}/nstat"
43FILES_${PN}-ss = "${base_sbindir}/ss" 46FILES_${PN}-ss = "${base_sbindir}/ss"
47FILES_${PN}-tipc = "${base_sbindir}/tipc"
44 48
45ALTERNATIVE_${PN} = "ip" 49ALTERNATIVE_${PN} = "ip"
46ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" 50ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"