Kudzu, ReiserFS, uClibc, gettext und Arbeit am Installer

[people/teissler/ipfire-2.x.git] / lfs / pciutils

diff --git a/lfs/pciutils b/lfs/pciutils
index aea6d637b13a6f425d926a2cb0d0968b3a953d88..973a9defd729c770d6b4535b782a135fe6516c31 100644 (file)
--- a/lfs/pciutils
+++ b/lfs/pciutils
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: pciutils,v 1.5.2.4 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2.1.11
+VER        = 2.2.3
 
 THISAPP    = pciutils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_KERNEL)/software/utils/pciutils
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(LFS_PASS)" "install"
   TARGET     = $(DIR_INFO)/$(THISAPP)-install
@@ -52,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1d40f90aaae69594790bdb8ff90b4a41
+$(DL_FILE)_MD5 = 86cc20eaa0360587497a8105d33e57fc
 
 install : $(TARGET)
 
@@ -81,24 +75,28 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-\r
-       # fix command line overflow which did not allow for null terminator\r
-       # when using  lspci -vvv (AGPx1 and AGPx2 and AGPx4) Gentoo borrowed\r
-       cd $(DIR_APP) && sed -i -e s/'rate\[8\]'/'rate\[9\]'/g lspci.c\r
-
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -i 's/null ;/null 2>\&1 ;/' update-pciids.sh
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-strip.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.1.10-scan.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-havepread.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-devicetype.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.2.1-idpath.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.1.99-gcc4.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.2.3-multilib.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.2.3-sata.patch
 ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP)/lib && CFLAGS="-Os -fomit-frame-pointer" ./configure
-       cd $(DIR_APP)/lib && CFLAGS="-Os -fomit-frame-pointer" make
-       -mkdir -p /install/include/pci
-       cd $(DIR_APP) && install -m 0644 lib/libpci.a /install/lib
-       cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /install/include/pci
+       cd $(DIR_APP)/lib && CFLAGS="-Os -fomit-frame-pointer" make $(MAKETUNING)
+       -mkdir -p /opt/$(MACHINE)-uClibc/include/pci
+       cd $(DIR_APP) && install -m 0644 lib/libpci.a /opt/$(MACHINE)-uClibc/lib
+       cd $(DIR_APP) && install -m 0644 lib/*.h /opt/$(MACHINE)-uClibc/include/pci
 else
-       cd $(DIR_APP) && make PREFIX=/usr ROOT=/usr
-       cd $(DIR_APP) && make PREFIX=/usr ROOT=/usr install
-       -mkdir -p /usr/include/pci
-       cd $(DIR_APP) && install -m 0644 lib/libpci.a /usr/lib
-       cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /usr/include/pci
+       cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING)
+       cd $(DIR_APP) && make PREFIX=/usr install
+       cd $(DIR_APP) && install -v -m 755 -d /usr/include/pci
+       cd $(DIR_APP) && install -v -m 644 lib/libpci.a /usr/lib
+       cd $(DIR_APP) && install -v -m 644 lib/*.h /usr/include/pci
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)