summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-04-13 18:43:04 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-26 10:05:08 +0100
commitf517fb89c51957e1e42f9be16417e761e497780d (patch)
treeb5df5109638b127a42b6f0ac2848cb929b797da2 /meta/recipes-extended
parentf8d6a50bd802cd07aac98d17348cdab662fd1d45 (diff)
downloadpoky-f517fb89c51957e1e42f9be16417e761e497780d.tar.gz
net-tools: Use update-alternatives
Switch to using ALTERNATIVE_LINKS to ensure the update-alternatives are setup properly, along with the package provides. (From OE-Core rev: 9f44708774cdcf623700b336d5a3a7bc40f91f0a) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-23.bb28
1 files changed, 9 insertions, 19 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
index c8d2c57923..b9a05c6fed 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "http://bugs.debian.org/net-tools"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
7 file://ifconfig.c;startline=11;endline=15;md5=da4c7bb79a5d0798faa99ef869721f4a" 7 file://ifconfig.c;startline=11;endline=15;md5=da4c7bb79a5d0798faa99ef869721f4a"
8PR = "r0" 8PR = "r1"
9 9
10SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \ 10SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \
11 ${DEBIAN_MIRROR}/main/n/net-tools/${BPN}_${PV}.diff.gz;apply=no;name=patch \ 11 ${DEBIAN_MIRROR}/main/n/net-tools/${BPN}_${PV}.diff.gz;apply=no;name=patch \
@@ -67,26 +67,16 @@ do_compile() {
67 oe_runmake 67 oe_runmake
68} 68}
69 69
70do_install() { 70inherit update-alternatives
71 oe_runmake 'BASEDIR=${D}' install
72 71
73 for app in ${D}/${base_sbindir}/* ${D}/${base_bindir}/*; do 72base_sbindir_progs = "arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach"
74 mv $app $app.${PN} 73ALTERNATIVE_LINKS += "${base_sbindir}/${@' ${base_sbindir}/'.join((d.getVar('base_sbindir_progs', True)).split())}"
75 done
76}
77 74
78pkg_postinst_${PN} () { 75base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname"
79 for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach ; do 76ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
80 update-alternatives --install ${base_sbindir}/$app $app $app.${PN} 100
81 done
82 77
83 for app in dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do 78ALTERNATIVE_PRIORITY = "100"
84 update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100
85 done
86}
87 79
88pkg_prerm_${PN} () { 80do_install() {
89 for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do 81 oe_runmake 'BASEDIR=${D}' install
90 update-alternatives --remove $app $app.${PN}
91 done
92} 82}