[oe-commits] : pciutils:

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.stable
Commit: 9112c6f83c3fec836848a85ee82c4f37307b7ad7
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=9112c6f83c3fec836848a85ee82c4f37307b7ad7

Author:  <xjqian at openembedded.org>
Date:   Mon Sep 22 06:00:02 2008 +0000

pciutils:
*add linux-gnuspe as valid system
*fixes install and staging. bug# 4565.
plucked revision from dev
ca63fe7da843b99d6a109e39aea7a28865c9f2a3
4fbc9814f4384aaee0a640571fcef547a3fe07d9 
applied partial changes from fe66b80f14a637cd1f15e4c29da3b38696cb8729
                     through 09677f41336b5e88788fbe514da56769201c3f97

---

 packages/pciutils/pciutils-2.2.4/configure.patch |   16 ++++++------
 packages/pciutils/pciutils_2.2.4.bb              |   26 ++++++++++++++++++++-
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/packages/pciutils/pciutils-2.2.4/configure.patch b/packages/pciutils/pciutils-2.2.4/configure.patch
index 78d113c..cfb5ef7 100644
--- a/packages/pciutils/pciutils-2.2.4/configure.patch
+++ b/packages/pciutils/pciutils-2.2.4/configure.patch
@@ -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
diff --git a/packages/pciutils/pciutils_2.2.4.bb b/packages/pciutils/pciutils_2.2.4.bb
index 0cd335e..2a909af 100644
--- a/packages/pciutils/pciutils_2.2.4.bb
+++ b/packages/pciutils/pciutils_2.2.4.bb
@@ -8,12 +8,12 @@ DEPENDS = "zlib"
 
 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 @@ LDFLAGS += "-lz"
 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"