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

From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [PATCH v2] pciutils: fix generation of pci.ids.gz
Date: Wed, 12 Aug 2009 15:13:17 -0700	[thread overview]
Message-ID: <20090812221317.GA13386@gmail.com> (raw)
In-Reply-To: <1250083051-31424-1-git-send-email-msmith@cbnco.com>

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