summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorTom Rini <trini@embeddedalley.com>2009-04-03 09:51:11 -0700
committerTom Rini <trini@embeddedalley.com>2009-04-06 14:45:34 -0700
commit28d0f54e301b5063eaf3587c57fd5422ae7fb2b2 (patch)
tree97fb45c9baf8a5b30fa59bfa26d041530c979023 /recipes
parent4c45e60d523f79b0ed9b8d31c6befb18936113a8 (diff)
wireless-tools: Fix libiw/ifrename packages, bump PR.
We weren't creating the above packages as we needed to use '=+' not '+=' here to take things from the default package. For these additional packages, add files with '=' not '+=' and we only need to add ${sysconfdir}/network to the base package glob. Also we need to run install-static to get libiw.a to be installed. Signed-off-by: Tom Rini <trini@embeddedalley.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/wireless-tools/wireless-tools.inc21
-rw-r--r--recipes/wireless-tools/wireless-tools_29.bb2
2 files changed, 11 insertions, 12 deletions
diff --git a/recipes/wireless-tools/wireless-tools.inc b/recipes/wireless-tools/wireless-tools.inc
index d2a7b89a50..f52c3f16a7 100644
--- a/recipes/wireless-tools/wireless-tools.inc
+++ b/recipes/wireless-tools/wireless-tools.inc
@@ -31,7 +31,7 @@ do_stage() {
}
do_install() {
- oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr
+ oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-static install-man install-hdr
install -d ${D}${sbindir}
install -m 0755 ifrename ${D}${sbindir}/ifrename
install -d ${D}${sysconfdir}/network/if-pre-up.d
@@ -39,13 +39,12 @@ do_install() {
install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless
}
-PACKAGES += "libiw libiw-dev libiw-doc libiw-dbg ifrename ifrename-dbg ifrename-doc"
-FILES_libiw += "${libdir}/*.so.*"
-FILES_libiw-dbg += "${libdir}/.debug/*.so.*"
-FILES_libiw-dev += "${libdir}/*.a ${libdir}/*.so ${includedir}"
-FILES_libiw-doc += "${mandir}/man7"
-FILES_ifrename += "${sbindir}/ifrename"
-FILES_ifrename-dbg += "${sbindir}/.debug/ifrename"
-FILES_ifrename-doc += "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
-FILES_${PN} += "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
-FILES_${PN}-doc += "${mandir}/man8"
+PACKAGES =+ "libiw libiw-dev libiw-doc libiw-dbg ifrename ifrename-dbg ifrename-doc"
+FILES_libiw = "${libdir}/*.so.*"
+FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
+FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
+FILES_libiw-doc = "${mandir}/man7"
+FILES_ifrename = "${sbindir}/ifrename"
+FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
+FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
+FILES_${PN} += "${sysconfdir}/network"
diff --git a/recipes/wireless-tools/wireless-tools_29.bb b/recipes/wireless-tools/wireless-tools_29.bb
index 196a1942d1..fb68127df1 100644
--- a/recipes/wireless-tools/wireless-tools_29.bb
+++ b/recipes/wireless-tools/wireless-tools_29.bb
@@ -1,3 +1,3 @@
require wireless-tools.inc
-PR = "r3"
+PR = "r4"