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 9fac85261945a7f735abbdfd608eb4548675472d..973a9defd729c770d6b4535b782a135fe6516c31 100644 (file)
--- a/lfs/pciutils
+++ b/lfs/pciutils
@@ -76,15 +76,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @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 $(MAKETUNING)
-       -mkdir -p /install/$(MACHINE)-uClibc/include/pci
-       cd $(DIR_APP) && install -m 0644 lib/libpci.a /install/$(MACHINE)-uClibc/lib
-       cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /install/$(MACHINE)-uClibc/include/pci
+       -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 $(MAKETUNING)
        cd $(DIR_APP) && make PREFIX=/usr install