Wir nehmen mal die Tools aus der Busybox zum formatieren des ext3.

TESTING.

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

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 2fe25fd17eefcc4d930ef2496a1141e55ca30d60..a2e4e3c0a7a4a81894a53d25cdbb4576d7f99f34 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -32,11 +32,7 @@ THISAPP    = e2fsprogs-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -76,30 +72,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-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 -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)/misc && install -m 755 e2initrd_helper /install/initrd/bin
-       cd $(DIR_APP)/misc && install -m 755 e2image  /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
-       cd $(DIR_APP)/lib/uuid && install -m 755 uuid.h /opt/$(MACHINE)-uClibc/include/uuid.h
-       cd $(DIR_APP) && unset LD_LIBRARY_PATH
-else
        cd $(DIR_SRC) && mkdir build
        cd $(DIR_SRC)/build && $(DIR_APP)/configure --prefix=/usr --with-root-prefix="" \
                                                --enable-elf-shlibs --disable-evms --disable-nls
        cd $(DIR_SRC)/build && make $(MAKETUNING)
        cd $(DIR_SRC)/build && make install
        cd $(DIR_SRC)/build && make install-libs
-endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 95e907da089cdfe3e75c5ae56ea8e53802e29b48..b2a714d135593e523e1caadb0f6e120e454b8424 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -563,7 +563,6 @@ buildinstaller() {
   installmake popt
   installmake sysvinit
   installmake misc-progs
-  installmake e2fsprogs
   installmake libaal
   installmake reiser4progs
   installmake reiserfsprogs