wireless-tools: Fix libiw/ifrename packages, bump PR.
PATCH 1/1 wireless-tools: Fix libiw/ifrename packages, bump PR.
I'm sending this for review since it actually puts ifrename into its own package as was apparently intended, but not happening. Giving people the weekend + Monday to complain and Tuesday AM (US -0700) I'll push.
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.
--- recipes/wireless-tools/wireless-tools.inc | 21 ++++++++++----------- recipes/wireless-tools/wireless-tools_29.bb | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-)
recipes/wireless-tools/wireless-tools.inc +10 -11
@@ -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"
recipes/wireless-tools/wireless-tools_29.bb +1 -1
@@ -1,3 +1,3 @@ require wireless-tools.inc -PR = "r3" +PR = "r4"
Signature · 4 lines
1.5.6.3 -- Tom Rini
Quoted 56 lines · Tom Rini
I'm sending this for review since it actually puts ifrename into its own package as was apparently intended, but not happening. Giving people the weekend + Monday to complain and Tuesday AM (US -0700) I'll push.
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.
--- recipes/wireless-tools/wireless-tools.inc | 21 ++++++++++----------- recipes/wireless-tools/wireless-tools_29.bb | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-)recipes/wireless-tools/wireless-tools.inc +10
-11@@ -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"recipes/wireless-tools/wireless-tools_29.bb +0
-0
recipes/wireless-tools/wireless-tools_29.bb line 3
Quoted 4 lines
recipes/wireless-tools/wireless-tools_29.bb +1
-1@@ -1,3 +1,3 @@ require wireless-tools.inc -PR = "r3" +PR = "r4"
Look ok to me.
Quoted 10 lines
Signature · 9 lines
1.5.6.3 -- Tom Rini _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Otavio Salvador
Acked-byQuoted 81 lines · Khem Raj
Quoted 58 lines · Tom Rini
I'm sending this for review since it actually puts ifrename into its own package as was apparently intended, but not happening. Giving people the weekend + Monday to complain and Tuesday AM (US -0700) I'll push.
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.
---
recipes/wireless-tools/wireless-tools.inc | 21 ++++++++++----------- recipes/wireless-tools/wireless-tools_29.bb | 2 +-2 files changed, 11 insertions(+), 12 deletions(-)recipes/wireless-tools/wireless-tools.inc +1
-1@@ -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
recipes/wireless-tools/wireless-tools.inc +0
-0@@ -39,13 +39,12 @@ do_install() {install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless }
recipes/wireless-tools/wireless-tools.inc +9
-10-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"recipes/wireless-tools/wireless-tools_29.bb +0
-0@@ -1,3 +1,3 @@require wireless-tools.inc
recipes/wireless-tools/wireless-tools_29.bb line 3
Quoted 2 lines
recipes/wireless-tools/wireless-tools_29.bb +1
-1-PR = "r3" +PR = "r4"Look ok to me.
Quoted 10 lines
--
1.5.6.3--
Tom Rini_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 9 lines · Tom Rini
I'm sending this for review since it actually puts ifrename into its own package as was apparently intended, but not happening. Giving people the weekend + Monday to complain and Tuesday AM (US -0700) I'll push.
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.
[...]
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br