aligns pciutils with dev: *add linux-gnuspe as valid system *fixes install and staging. bug# 4565.
plucked revision from dev ca63fe7da843b99d6a109e39aea7a28865c9f2a3 4fbc9814f4384aaee0a640571fcef547a3fe07d9 Regards Gordon
# # old_revision [cf41eb9c3663b151d6ce4294b79baf9e4f0565f7] # # patch "packages/pciutils/pciutils-2.2.4/configure.patch" # from [aa73b31a034d658dd86fbc5502fb8e47c1448f4c] # to [f1bc5e3c06c4d899283842790d5370397133be9d] # # patch "packages/pciutils/pciutils_2.2.4.bb" # from [86d87aa633c415ab2ef8e0ec59eb7d7008fb0f90] # to [6585c82a974ce5c9c05ce686811013df475e0151] # ============================================================ --- packages/pciutils/pciutils-2.2.4/configure.patch aa73b31a034d658dd86fbc5502fb8e47c1448f4c +++ packages/pciutils/pciutils-2.2.4/configure.patch f1bc5e3c06c4d899283842790d5370397133be9d @@ -1,13 +1,8 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - Index: pciutils-2.2.4/lib/configure =================================================================== --- pciutils-2.2.4.orig/lib/configure 2006-09-09 13:06:10.000000000 +0200 -+++ pciutils-2.2.4/lib/configure 2006-10-31 11:52:13.000000000 +0100 -@@ -12,15 +12,15 @@ ++++ pciutils-2.2.4/lib/configure 2008-06-17 10:15:07.000000000 +0200 +@@ -12,15 +12,15 @@ echo_n() { echo_n "Configuring libpci for your system..." idsdir=${1:-/usr/share} version=${2:-0.0} @@ -26,10 +21,15 @@ Index: pciutils-2.2.4/lib/configure fi if [ "$sys" = "GNU/kFreeBSD" ] then -@@ -34,6 +34,11 @@ +@@ -34,6 +34,16 @@ rel=${4:-$rel} echo " $host $rel" zlib=$5 ++if [ "$host" = "linux--gnuspe" ] ++then ++ sys=linux ++fi ++ +if [ "$host" = "linux--gnueabi" ] +then + sys=linux ============================================================ --- packages/pciutils/pciutils_2.2.4.bb 86d87aa633c415ab2ef8e0ec59eb7d7008fb0f90 +++ packages/pciutils/pciutils_2.2.4.bb 6585c82a974ce5c9c05ce686811013df475e0151 @@ -8,12 +8,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/soft SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ - file://configure-uclibc.patch;patch=1 \ + file://configure-uclibc.patch;patch=1 \ file://pcimodules-pciutils.diff;patch=1" PARALLEL_MAKE = "" -PR="r1" +PR="r3" do_configure () { (cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH}) @@ -29,10 +29,32 @@ do_install () { do_install () { oe_runmake install } + do_install_append () { install -d ${D}/${prefix}/share install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share + + # The makefile does not install the development files: + # libpci.a pci.h header.h config.h types.s + install -d ${D}/${libdir} + install -d ${D}/${includedir}/pci + + oe_libinstall -a -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/ } +do_stage () { + oe_libinstall -a -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="${prefix}/share/pci.ids"
_______________________________________________ Openembedded-stablebranch mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
