summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 17:44:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:26:36 +0100
commit264a6e4982bdaf830bb22b26d4a196d4f0ef7b7d (patch)
tree8edf2b648917f07ea1f971def6da4cc6e19dad9a /meta/recipes-extended
parent22f1c95bf529482c0662211f9e74981f9d25d7d2 (diff)
downloadpoky-264a6e4982bdaf830bb22b26d4a196d4f0ef7b7d.tar.gz
net-tools: cleanup update-alternatives deprecated code
(From OE-Core rev: f8b25d33e154173e2ce022c88563c6be872ce4b4) Signed-off-by: Saul Wold <sgw@linux.intel.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.bb19
1 files changed, 12 insertions, 7 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 764955e576..309363bb6b 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 = "r1" 8PR = "r2"
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,16 +67,21 @@ do_compile() {
67 oe_runmake 67 oe_runmake
68} 68}
69 69
70do_install() {
71 oe_runmake 'BASEDIR=${D}' install
72}
73
70inherit update-alternatives 74inherit update-alternatives
71 75
72base_sbindir_progs = "arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach" 76base_sbindir_progs = "arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach"
73ALTERNATIVE_LINKS += "${base_sbindir}/${@' ${base_sbindir}/'.join((d.getVar('base_sbindir_progs', True)).split())}"
74
75base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname" 77base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname"
76ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
77 78
79ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}"
80python __anonymous() {
81 for prog in d.getVar('base_sbindir_progs', True).split():
82 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog))
83 for prog in d.getVar('base_bindir_progs', True).split():
84 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog))
85}
78ALTERNATIVE_PRIORITY = "100" 86ALTERNATIVE_PRIORITY = "100"
79 87
80do_install() {
81 oe_runmake 'BASEDIR=${D}' install
82}