Patchwork [05/26] wireless-tools: Updated for staticdev packaging

login
register
mail settings
Submitter Saul Wold
Date July 11, 2011, 11:13 p.m.
Message ID <b7b22ed31de766af73e19834937744280273bdd5.1310425837.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/7349/
State New, archived
Headers show

Comments

Saul Wold - July 11, 2011, 11:13 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../wireless-tools/wireless-tools_29.bb            |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
Koen Kooi - July 12, 2011, 7:02 a.m.
Op 12 jul 2011, om 01:13 heeft Saul Wold het volgende geschreven:

> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../wireless-tools/wireless-tools_29.bb            |   12 +++++++-----
> 1 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
> index cc51dec..a9de242 100644
> --- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
> +++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> 			file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
> SECTION = "base"
> PE = "1"
> -PR = "r2"
> +PR = "r3"
> 
> SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
>            file://man.patch;apply=yes \
> @@ -41,13 +41,15 @@ do_install() {
> }
> 
> PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \
> -libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc"
> +libiw libiw-dev libiw-doc libiw-staticdev ifrename-doc ifrename ${PN} ${PN}-doc"

Overriding PACKAGES is a bug, so:

PACKAGES =+ "libiw libiw-dev libiw-doc libiw-staticdev ifrename-doc ifrename"

> 
> -FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
> +FILES_libiw-dbg = "${libdir}/.debug/*${SOLIBS}"
> FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
> -FILES_libiw = "${libdir}/*.so.*"
> -FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
> +FILES_libiw = "${libdir}/*${SOLIBS}"
> +FILES_libiw-dev = "${libdir}/${SOLIBSDEV} ${includedir}"
> FILES_libiw-doc = "${mandir}/man7"
> +FILES_libiw-staticdev = "${libdir}/*.a"
> +RDEPENDS_libiw-staticdev = "libiw-dev (= ${EXTENDPKGV})"
> FILES_ifrename = "${sbindir}/ifrename"
> FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
> FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
> -- 
> 1.7.3.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index cc51dec..a9de242 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -7,7 +7,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 			file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
 SECTION = "base"
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
            file://man.patch;apply=yes \
@@ -41,13 +41,15 @@  do_install() {
 }
 
 PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \
-libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc"
+libiw libiw-dev libiw-doc libiw-staticdev ifrename-doc ifrename ${PN} ${PN}-doc"
 
-FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
+FILES_libiw-dbg = "${libdir}/.debug/*${SOLIBS}"
 FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
-FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
+FILES_libiw = "${libdir}/*${SOLIBS}"
+FILES_libiw-dev = "${libdir}/${SOLIBSDEV} ${includedir}"
 FILES_libiw-doc = "${mandir}/man7"
+FILES_libiw-staticdev = "${libdir}/*.a"
+RDEPENDS_libiw-staticdev = "libiw-dev (= ${EXTENDPKGV})"
 FILES_ifrename = "${sbindir}/ifrename"
 FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
 FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"