Eine Menge Buildfixes...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@348 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d73656b80ff16ada2a2205b1c34b47238d74b0d3..588838976bdf994e601c91de4bef1ba546e8527d 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -106,7 +106,6 @@
 * java-1.5.0_06-for-ipfire
 * jpegsrc.v6b
 * kbd-1.12
-* kudzu-1.1.95.15
 * kudzu-1.2.60
 * l7-protocols-2006-09-10
 * lame-3.96.1

diff --git a/lfs/busybox b/lfs/busybox
index 17ab57706b662d39afafdc6a6bb95bd1943cdfd4..e193dbe13b6b620be501e2d4fee8e22cebb4372f 100644 (file)
--- a/lfs/busybox
+++ b/lfs/busybox
@@ -72,12 +72,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       -mkdir -p /install/initrd/bin
+       -mkdir -p /install/initrd/{,s}bin
        cd $(DIR_APP) && cp -f $(DIR_SRC)/config/uClibc/busybox.config .config
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        mkdir -p /install/initrd/usr/share/udhcpc
        cd $(DIR_APP) && install -m 0755 examples/udhcp/simple.script \
                /install/initrd/usr/share/udhcpc/default.script
-       @rm -rf $(DIR_APP)
+       @rm -rf $(DIR_APP) /install/initrd/linuxrc
        @$(POSTBUILD)

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index e43b3b908fb78689367ad7efbdc986d9a7249e03..4869072c381ea3446d9283ddff8ba4db41700731 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -79,15 +79,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" ./configure --host=$(BUILDTARGET) --disable-nls \
                --prefix=/opt/$(MACHINE)-uClibc
-       
        # build 'mke2fs 1.39' to override version used in busybox.
        # To be removed when busybox will use also e2fsprogs 1.39
        # remove link installed by busybox
-       rm /install/initrd/bin/mke2fs
+       -rm -f /install/initrd/bin/mke2fs
        cd $(DIR_APP) && make install-libs
        cd $(DIR_APP) && make progs
        cd $(DIR_APP)/misc && install -m 755 mke2fs /install/initrd/bin
-       
        cd $(DIR_APP)/lib/uuid && make
        cd $(DIR_APP)/lib/uuid && make install
        cd $(DIR_APP)/lib/uuid && install -m 755 libuuid.a /opt/$(MACHINE)-uClibc/lib/libuuid.a

diff --git a/lfs/gettext b/lfs/gettext
index d48d609b0910b2b723b0f7bceebbe190510fdeb2..6cb91a481bc326d916a2fcffdb6aa46f1e99f2e0 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -104,8 +104,8 @@ else
 endif
 else
        cd $(DIR_APP)/gettext-tools && ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP)/gettext-tools && make -C lib $(MAKETUNING)
-       cd $(DIR_APP)/gettext-tools && make -C src msgfmt $(MAKETUNING)
+       cd $(DIR_APP)/gettext-tools && make -C lib
+       cd $(DIR_APP)/gettext-tools && make -C src msgfmt
        cd $(DIR_APP)/gettext-tools && cp -v src/msgfmt /tools/bin
 endif
        @rm -rf $(DIR_APP)

diff --git a/lfs/initrd b/lfs/initrd
index f3c7b784452303503db1e64765c53a3d2b6b7f2e..35da2464ade6e570909a91cb1b1d8033678e6fa5 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -54,7 +54,6 @@ $(TARGET) :
 
        # Finish up initrd directory
        -mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys} && \
-       cd /install/initrd && ln -sfn bin sbin
        cd /install/initrd/etc && rm -f fstab
        cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
        rm -rf /install/initrd/etc{,/udev,/udev/rules.d}/.svn

diff --git a/lfs/openswan b/lfs/openswan
index 114f0f10e5cb0a1378c7cae4e7d8c0a7d8ad88d3..16565db11f6a5b82b7819650fcf72b44b8d83e3b 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -76,8 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
                -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
                -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
-       cd $(DIR_APP) && make $(MAKETUNING) programs
-       cd $(DIR_APP) && make $(MAKETUNING) install
+       cd $(DIR_APP) && make programs
+       cd $(DIR_APP) && make install
        #mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/
        rm -f /etc/ipsec.conf /etc/ipsec.secrets
        ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf

diff --git a/make.sh b/make.sh
index 78c5d01e8aeafa7e9b8f46871ca7ce67a6a3c57c..93567a9cbba6f00a1e9306aaf88a0038e866b566 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -555,7 +555,7 @@ buildinstaller() {
   installmake e2fsprogs
   installmake misc-progs
   installmake sysfsutils
-  installmake hwinfo
+#  installmake hwinfo
   installmake slang
   installmake util-linux
   installmake reiserfsprogs