Improve pciutils based on Bernhard Reutner-Fischer's git repository (http://repo...

diff --git a/package/pciutils/Config.in b/package/pciutils/Config.in
index 18bd65587aa1a640bebab926a9bfa82100b53170..9b3c83d9ab723de53c0a5eef1250ecaa3374b673 100644 (file)
--- a/package/pciutils/Config.in
+++ b/package/pciutils/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PCIUTILS
        bool "pciutils"
-       depends on BR2_PACKAGE_ZLIB
+       default n
        help
          Various utilities dealing with the PCI bus.
          Provides things like setpci and lspci.

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 14c548933dff8a77f062dbacf1653d00067d18ab..854c955b78e5a23c5c543549f35a7a625c8fd304 100644 (file)
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -4,6 +4,7 @@
 #
 #############################################################
 PCIUTILS_VERSION:=2.2.10
+PCIUTILS_VERSION:=3.0.1
 PCIUTILS_SOURCE:=pciutils-$(PCIUTILS_VERSION).tar.gz
 PCIUTILS_CAT:=$(ZCAT)
 PCIUTILS_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
@@ -14,40 +15,55 @@ PCIIDS_SITE:=http://pciids.sourceforge.net/
 PCIIDS_SOURCE:=pci.ids.bz2
 PCIIDS_CAT:=$(BZCAT)
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+PCIUTILS_HAVE_ZLIB=yes
+PCIIDS_FILE=pci.ids.gz
+else
+PCIUTILS_HAVE_ZLIB=no
+PCIIDS_FILE=pci.ids
+endif
+
 $(DL_DIR)/$(PCIUTILS_SOURCE):
         $(WGET) -P $(DL_DIR) $(PCIUTILS_SITE)/$(PCIUTILS_SOURCE)
 
 $(DL_DIR)/$(PCIIDS_SOURCE):
        $(WGET) -P $(DL_DIR) $(PCIIDS_SITE)/$(PCIIDS_SOURCE)
 
-pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
-
 $(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
        $(PCIUTILS_CAT) $(DL_DIR)/$(PCIUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/pci.ids
-       toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils\*.patch
+       $(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/$(PCIIDS_FILE)
+       toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils-$(PCIUTILS_VERSION)\*.patch
+       #$(CONFIG_UPDATE) $(@D)
+       $(SED) 's/uname -s/echo Linux/' \
+               -e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \
+               $(PCIUTILS_DIR)/lib/configure
        touch $@
 
 $(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked
-       $(MAKE1) CC=$(TARGET_CC) OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR) \
+       $(MAKE1) CC="$(TARGET_CC)" OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR) \
                SHAREDIR="/usr/share/misc" \
+               ZLIB=$(PCIUTILS_HAVE_ZLIB) \
                PREFIX=/usr
        touch $@
 
 $(TARGET_DIR)/sbin/lspci: $(PCIUTILS_DIR)/.compiled
-       install -c $(PCIUTILS_DIR)/lspci $(TARGET_DIR)/sbin/lspci
+       $(INSTALL) $(PCIUTILS_DIR)/lspci $(TARGET_DIR)/sbin/lspci
+       $(STRIPCMD) $(STRIP_STRIP_ALL) $@
 
 $(TARGET_DIR)/sbin/setpci: $(PCIUTILS_DIR)/.compiled
-       install -c $(PCIUTILS_DIR)/setpci $(TARGET_DIR)/sbin/setpci
+       $(INSTALL) $(PCIUTILS_DIR)/setpci $(TARGET_DIR)/sbin/setpci
+       $(STRIPCMD) $(STRIP_STRIP_ALL) $@
+
+$(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE): $(PCIUTILS_DIR)/.unpacked
+       $(INSTALL) -D $(PCIUTILS_DIR)/$(PCIIDS_FILE) $(@D)
 
-$(TARGET_DIR)/usr/share/misc/pci.ids: $(PCIUTILS_DIR)/.unpacked
-       install -Dc $(PCIUTILS_DIR)/pci.ids $(TARGET_DIR)/usr/share/misc/pci.ids
+pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE)
 
-pciutils: uclibc zlib $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/pci.ids
+pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
 
 pciutils-clean:
-       rm $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/usr/share/misc/pci.ids
        -$(MAKE) -C $(PCIUTILS_DIR) clean
+       rm -f $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/usr/share/misc/pci.ids*
 
 pciutils-dirclean:
        rm -rf $(PCIUTILS_DIR)
@@ -57,6 +73,6 @@ pciutils-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_PACKAGE_PCIUTILS)),y)
+ifeq ($(BR2_PACKAGE_PCIUTILS),y)
 TARGETS+=pciutils
 endif

diff --git a/package/pciutils/pciutils.patch b/package/pciutils/pciutils.patch
deleted file mode 100644 (file)
index f2d773c..0000000
--- a/package/pciutils/pciutils.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- pciutils-2.2.6/lib/configure
-+++ pciutils-2.2.6/lib/configure
-@@ -12,7 +12,7 @@
- echo_n "Configuring libpci for your system..."
- sharedir=${1:-/usr/share}
- version=${2:-0.0}
--sys=`uname -s`
-+sys=Linux
- rel=`uname -r`
- if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
- then
-