summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <qi.chen@windriver.com>2013-12-05 10:54:36 -0500
committerChen Qi <Qi.Chen@windriver.com>2014-09-09 14:34:21 +0800
commitb96a6f2a162ef49f6f0492337f7402e72e6d56c0 (patch)
tree67822de7640b454a044f85d6b001b2f9103bbd9d
parent479939f8aff61e4697df9b04a072a52c9108be7c (diff)
downloadopenembedded-core-contrib-b96a6f2a162ef49f6f0492337f7402e72e6d56c0.tar.gz
openembedded-core-contrib-b96a6f2a162ef49f6f0492337f7402e72e6d56c0.tar.bz2
openembedded-core-contrib-b96a6f2a162ef49f6f0492337f7402e72e6d56c0.zip
iputils: fix program location and QA warning
[CQID: WIND00444742] According to FHS, only `ping' is required to be under /bin. So this patch move other commands like `ping6' and 'traceroute6' to /usr/bin. Doing so will fix QA warnings of unsafe reference of binaries in ping6. /bin/ping6.iputils requires /usr/lib/libgnutls.so.26 /bin/ping6.iputils requires /usr/lib/libgcrypt.so.11 /bin/ping6.iputils requires /usr/lib/libgpg-error.so.0 /bin/ping6.iputils requires /usr/lib/libtasn1.so.6 (LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20131113 Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
-rw-r--r--meta/recipes-extended/iputils/iputils_s20121221.bb29
1 files changed, 18 insertions, 11 deletions
diff --git a/meta/recipes-extended/iputils/iputils_s20121221.bb b/meta/recipes-extended/iputils/iputils_s20121221.bb
index 46f8903222..5849f0d2a0 100644
--- a/meta/recipes-extended/iputils/iputils_s20121221.bb
+++ b/meta/recipes-extended/iputils/iputils_s20121221.bb
@@ -29,15 +29,16 @@ do_compile () {
}
do_install () {
- install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8
+ install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8 ${D}${bindir} ${D}${sbindir}
# SUID root programs
install -m 4555 ping ${D}${base_bindir}/ping
- install -m 4555 ping6 ${D}${base_bindir}/ping6
- install -m 4555 traceroute6 ${D}${base_bindir}/
+ install -m 4555 ping6 ${D}${bindir}/ping6
+ install -m 4555 traceroute6 ${D}${bindir}/
# Other programgs
- for i in arping tracepath tracepath6; do
- install -m 0755 $i ${D}${base_bindir}/
+ for i in tracepath tracepath6; do
+ install -m 0755 $i ${D}${bindir}/
done
+ install -m 0755 arping ${D}${sbindir}/
# Manual pages for things we build packages for
for i in tracepath.8 traceroute6.8 ping.8 arping.8; do
install -m 0644 doc/$i ${D}${mandir}/man8/ || true
@@ -52,7 +53,13 @@ ALTERNATIVE_${PN}-ping = "ping"
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
ALTERNATIVE_${PN}-ping6 = "ping6"
-ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6"
+ALTERNATIVE_LINK_NAME[ping6] = "${bindir}/ping6"
+
+ALTERNATIVE_${PN}-traceroute6 = "traceroute6"
+ALTERNATIVE_LINK_NAME[traceroute6] = "${bindir}/traceroute6"
+
+ALTERNATIVE_${PN}-arping = "arping"
+ALTERNATIVE_LINK_NAME[arping] = "${sbindir}/arping"
PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6"
@@ -61,9 +68,9 @@ RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tra
FILES_${PN} = ""
FILES_${PN}-ping = "${base_bindir}/ping.${BPN}"
-FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}"
-FILES_${PN}-arping = "${base_bindir}/arping"
-FILES_${PN}-tracepath = "${base_bindir}/tracepath"
-FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6"
-FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6"
+FILES_${PN}-ping6 = "${bindir}/ping6.${BPN}"
+FILES_${PN}-arping = "${sbindir}/arping.${BPN}"
+FILES_${PN}-tracepath = "${bindir}/tracepath"
+FILES_${PN}-tracepath6 = "${bindir}/tracepath6"
+FILES_${PN}-traceroute6 = "${bindir}/traceroute6.${BPN}"
FILES_${PN}-doc = "${mandir}/man8"