[PATCH] pciutils: fix generation of pci.ids.gz

[PATCH] pciutils: fix generation of pci.ids.gz

[Michael Smith]

Set ZLIB=yes to prevent auto-detection by the lib/configure script,
which only looks in /usr/include.

Also fix perms for pci.ids.gz.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/pciutils/pciutils_3.1.2.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/pciutils/pciutils_3.1.2.bb b/recipes/pciutils/pciutils_3.1.2.bb
index f23e6dd..914fdf7 100644
--- a/recipes/pciutils/pciutils_3.1.2.bb
+++ b/recipes/pciutils/pciutils_3.1.2.bb
@@ -12,12 +12,13 @@ SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;patch=1 "
 
 PARALLEL_MAKE = ""
 
-PR ="r4"
+PR ="r5"
 
 EXTRA_OEMAKE += "'STRIP = '"
 export SHARED=yes
 
 do_configure () {
+	export ZLIB=yes
 	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
 }
 
@@ -34,7 +35,7 @@ do_install () {
 
 do_install_append () {
 	install -d ${D}/${datadir}
-	install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${datadir}
+	install -m 0644 ${WORKDIR}/${PN}-${PV}/pci.ids.gz ${D}/${datadir}
 
 	# The makefile does not install the development files:
 	# libpci.so pci.h header.h config.h types.h
@@ -59,4 +60,4 @@ do_stage () {
 
 
 PACKAGES =+ "pciutils-ids"
-FILES_pciutils-ids="${datadir}/pci.ids"
+FILES_pciutils-ids="${datadir}/pci.ids.gz"
-- 
1.6.3

Re: [PATCH] pciutils: fix generation of pci.ids.gz

[Khem Raj]

On (10/08/09 13:01), Michael Smith wrote:
> Set ZLIB=yes to prevent auto-detection by the lib/configure script,
> which only looks in /usr/include.

Some older versions of hal could only use uncompressed version. So may be you
could package both versions or leave a possiblity to package
uncompressed version somehow.

Thx

-Khem

Re: [PATCH] pciutils: fix generation of pci.ids.gz

[Michael Smith]

Khem Raj wrote:
> Some older versions of hal could only use uncompressed version. So may be you
> could package both versions or leave a possiblity to package
> uncompressed version somehow.

Hi Khem,

I could put pci.ids into pciutils-ids-uncompressed, would that work? I 
don't see a reference to pciutils-ids in any recipe or image outside 
pciutils, so I'm guessing this is something a hal user would install 
manually after installation?

Thanks,
Mike

Re: [PATCH] pciutils: fix generation of pci.ids.gz

[Khem Raj]

On Mon, Aug 10, 2009 at 2:15 PM, Michael Smith<msmith@cbnco.com> wrote:
> Khem Raj wrote:
>>
>> Some older versions of hal could only use uncompressed version. So may be
>> you
>> could package both versions or leave a possiblity to package
>> uncompressed version somehow.
>
> Hi Khem,
>
> I could put pci.ids into pciutils-ids-uncompressed, would that work? I don't
> see a reference to pciutils-ids in any recipe or image outside pciutils, so
> I'm guessing this is something a hal user would install manually after
> installation?

That would be ok

>
> Thanks,
> Mike
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

[PATCH v2] pciutils: fix generation of pci.ids.gz

[Michael Smith]

Set ZLIB=yes to prevent auto-detection by the lib/configure script,
which only looks in /usr/include.

Ship pci.ids in pci-ids-uncompressed for users of old hal versions.

Pass PREFIX to Make and use the install-lib target to save work.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/pciutils/pciutils_3.1.2.bb |   46 ++++++++++++++----------------------
 1 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/recipes/pciutils/pciutils_3.1.2.bb b/recipes/pciutils/pciutils_3.1.2.bb
index f23e6dd..ae7b3a7 100644
--- a/recipes/pciutils/pciutils_3.1.2.bb
+++ b/recipes/pciutils/pciutils_3.1.2.bb
@@ -12,15 +12,10 @@ SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;patch=1 "
 
 PARALLEL_MAKE = ""
 
-PR ="r4"
+PR = "r5"
 
-EXTRA_OEMAKE += "'STRIP = '"
+EXTRA_OEMAKE += "'STRIP = ' PREFIX=${prefix} LIBDIR=${libdir}"
 export SHARED=yes
-
-do_configure () {
-	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
-}
-
 export DESTDIR = "${D}"
 export PREFIX = "${prefix}"
 export SBINDIR = "${sbindir}"
@@ -28,35 +23,30 @@ export SHAREDIR = "${datadir}"
 export MANDIR = "${mandir}"
 export IDSDIR = "${datadir}"
 
-do_install () {
-	oe_runmake install
+do_configure () {
+	export ZLIB=yes
+	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
 }
 
-do_install_append () {
-	install -d ${D}/${datadir}
-	install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${datadir}
-
-	# The makefile does not install the development files:
-	# libpci.so pci.h header.h config.h types.h
-	install -d ${D}/${libdir}
-	install -d ${D}/${includedir}/pci
+do_install () {
+	oe_runmake install install-lib
 
+	# "make install" misses the debug file for the library
 	oe_libinstall -so -C lib libpci ${D}/${libdir}
-	install -m 0644 ${S}/lib/pci.h ${D}/${includedir}/pci/
-	install -m 0644 ${S}/lib/header.h ${D}/${includedir}/pci/
-	install -m 0644 ${S}/lib/config.h ${D}/${includedir}/pci/
-	install -m 0644 ${S}/lib/types.h ${D}/${includedir}/pci/
+
+	# Some older versions of hal may need the uncompressed version.
+	# We install it in a separate package, pciutils-ids-uncompressed.
+	install -m 0644 ${S}/pci.ids ${D}/${datadir}
 }
 
 do_stage () {
+	oe_runmake install-lib DESTDIR=${STAGING_DIR_HOST}
+
+	# "make install-lib" misses the symlink libpci.so.3
 	oe_libinstall -so -C lib libpci ${STAGING_LIBDIR}
-	install -m 0755 -d ${STAGING_INCDIR}/pci
-	install -m 0644 ${S}/lib/pci.h ${STAGING_INCDIR}/pci/
-	install -m 0644 ${S}/lib/header.h ${STAGING_INCDIR}/pci/
-	install -m 0644 ${S}/lib/config.h ${STAGING_INCDIR}/pci/
-	install -m 0644 ${S}/lib/types.h ${STAGING_INCDIR}/pci/
 }
 
 
-PACKAGES =+ "pciutils-ids"
-FILES_pciutils-ids="${datadir}/pci.ids"
+PACKAGES =+ "${PN}-ids ${PN}-ids-uncompressed"
+FILES_${PN}-ids = "${datadir}/pci.ids.gz"
+FILES_${PN}-ids-uncompressed = "${datadir}/pci.ids"
-- 
1.6.3

Re: [PATCH v2] pciutils: fix generation of pci.ids.gz

[Khem Raj]

On (12/08/09 09:17), Michael Smith wrote:
> Set ZLIB=yes to prevent auto-detection by the lib/configure script,
> which only looks in /usr/include.
> 
> Ship pci.ids in pci-ids-uncompressed for users of old hal versions.
> 
> Pass PREFIX to Make and use the install-lib target to save work.
> 
> Signed-off-by: Michael Smith <msmith@cbnco.com>

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
>  recipes/pciutils/pciutils_3.1.2.bb |   46 ++++++++++++++----------------------
>  1 files changed, 18 insertions(+), 28 deletions(-)
> 
> diff --git a/recipes/pciutils/pciutils_3.1.2.bb b/recipes/pciutils/pciutils_3.1.2.bb
> index f23e6dd..ae7b3a7 100644
> --- a/recipes/pciutils/pciutils_3.1.2.bb
> +++ b/recipes/pciutils/pciutils_3.1.2.bb
> @@ -12,15 +12,10 @@ SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;patch=1 "
>  
>  PARALLEL_MAKE = ""
>  
> -PR ="r4"
> +PR = "r5"
>  
> -EXTRA_OEMAKE += "'STRIP = '"
> +EXTRA_OEMAKE += "'STRIP = ' PREFIX=${prefix} LIBDIR=${libdir}"
>  export SHARED=yes
> -
> -do_configure () {
> -	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
> -}
> -
>  export DESTDIR = "${D}"
>  export PREFIX = "${prefix}"
>  export SBINDIR = "${sbindir}"
> @@ -28,35 +23,30 @@ export SHAREDIR = "${datadir}"
>  export MANDIR = "${mandir}"
>  export IDSDIR = "${datadir}"
>  
> -do_install () {
> -	oe_runmake install
> +do_configure () {
> +	export ZLIB=yes
> +	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
>  }
>  
> -do_install_append () {
> -	install -d ${D}/${datadir}
> -	install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${datadir}
> -
> -	# The makefile does not install the development files:
> -	# libpci.so pci.h header.h config.h types.h
> -	install -d ${D}/${libdir}
> -	install -d ${D}/${includedir}/pci
> +do_install () {
> +	oe_runmake install install-lib
>  
> +	# "make install" misses the debug file for the library
>  	oe_libinstall -so -C lib libpci ${D}/${libdir}
> -	install -m 0644 ${S}/lib/pci.h ${D}/${includedir}/pci/
> -	install -m 0644 ${S}/lib/header.h ${D}/${includedir}/pci/
> -	install -m 0644 ${S}/lib/config.h ${D}/${includedir}/pci/
> -	install -m 0644 ${S}/lib/types.h ${D}/${includedir}/pci/
> +
> +	# Some older versions of hal may need the uncompressed version.
> +	# We install it in a separate package, pciutils-ids-uncompressed.
> +	install -m 0644 ${S}/pci.ids ${D}/${datadir}
>  }
>  
>  do_stage () {
> +	oe_runmake install-lib DESTDIR=${STAGING_DIR_HOST}
> +
> +	# "make install-lib" misses the symlink libpci.so.3
>  	oe_libinstall -so -C lib libpci ${STAGING_LIBDIR}
> -	install -m 0755 -d ${STAGING_INCDIR}/pci
> -	install -m 0644 ${S}/lib/pci.h ${STAGING_INCDIR}/pci/
> -	install -m 0644 ${S}/lib/header.h ${STAGING_INCDIR}/pci/
> -	install -m 0644 ${S}/lib/config.h ${STAGING_INCDIR}/pci/
> -	install -m 0644 ${S}/lib/types.h ${STAGING_INCDIR}/pci/
>  }
>  
>  
> -PACKAGES =+ "pciutils-ids"
> -FILES_pciutils-ids="${datadir}/pci.ids"
> +PACKAGES =+ "${PN}-ids ${PN}-ids-uncompressed"
> +FILES_${PN}-ids = "${datadir}/pci.ids.gz"
> +FILES_${PN}-ids-uncompressed = "${datadir}/pci.ids"
> -- 
> 1.6.3
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH v2] pciutils: fix generation of pci.ids.gz

[Michael Smith]

Khem Raj wrote:
> On (12/08/09 09:17), Michael Smith wrote:

>> Signed-off-by: Michael Smith <msmith@cbnco.com>
> 
> Acked-by: Khem Raj <raj.khem@gmail.com>

Thanks Khem. Could you please apply it? I don't have commit rights.

Mike

Re: [PATCH v2] pciutils: fix generation of pci.ids.gz

[Holger Hans Peter Freyther]

On Thursday 13 August 2009 16:49:58 Michael Smith wrote:
> Khem Raj wrote:
> > On (12/08/09 09:17), Michael Smith wrote:
> >> Signed-off-by: Michael Smith <msmith@cbnco.com>
> >
> > Acked-by: Khem Raj <raj.khem@gmail.com>
>
> Thanks Khem. Could you please apply it? I don't have commit rights.

Do you want to change that? How many of your patches are still not 
applied/pushed?

z.

Re: [PATCH v2] pciutils: fix generation of pci.ids.gz

[Michael Smith]

Holger Hans Peter Freyther wrote:
> On Thursday 13 August 2009 16:49:58 Michael Smith wrote:
>> Thanks Khem. Could you please apply it? I don't have commit rights.
> 
> Do you want to change that? How many of your patches are still not 
> applied/pushed?

I think it's down to about a dozen now. But yeah, that would be great!

Mike

Re: [PATCH v2] pciutils: fix generation of pci.ids.gz

[Denys Dmytriyenko]

On Thu, Aug 13, 2009 at 11:29:18AM -0400, Michael Smith wrote:
> Holger Hans Peter Freyther wrote:
>> On Thursday 13 August 2009 16:49:58 Michael Smith wrote:
>>> Thanks Khem. Could you please apply it? I don't have commit rights.
>> Do you want to change that? How many of your patches are still not 
>> applied/pushed?
>
> I think it's down to about a dozen now. But yeah, that would be great!

+1 to give Michael commit rights.

-- 
Denys

Re: [PATCH v2] pciutils: fix generation of pci.ids.gz

[Tom Rini]

On Fri, Aug 14, 2009 at 02:44:39AM -0400, Denys Dmytriyenko wrote:
> On Thu, Aug 13, 2009 at 11:29:18AM -0400, Michael Smith wrote:
> > Holger Hans Peter Freyther wrote:
> >> On Thursday 13 August 2009 16:49:58 Michael Smith wrote:
> >>> Thanks Khem. Could you please apply it? I don't have commit rights.
> >> Do you want to change that? How many of your patches are still not 
> >> applied/pushed?
> >
> > I think it's down to about a dozen now. But yeah, that would be great!
> 
> +1 to give Michael commit rights.

I'll +1 Michael for commit rights as well.

-- 
Tom Rini