Zwischencommit Installer.

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

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index af77ba1faca8132c2be7100c9818512ffaf10ba5..b4b2d71d56834ab6ae8ee64e280536426dabb607 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -32,7 +32,7 @@ THISAPP    = e2fsprogs-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(PASS)" "install"
+ifeq "$(LFS_PASS)" "install"
   TARGET     = $(DIR_INFO)/$(THISAPP)-install
 else
   TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -76,21 +76,22 @@ $(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 "$(PASS)" "install"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-install.patch
-       -mkdir -p /install/misc/bin
-       cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" ./configure --disable-nls
-       cd $(DIR_APP)/util && CC=/usr/bin/gcc BUILD_CC=/usr/bin/gcc make -e
-       cd $(DIR_APP) && make lib/blkid/blkid_types.h
-       cd $(DIR_APP) && make lib/ext2fs/ext2_types.h
-       cd $(DIR_APP) && make lib/uuid/uuid_types.h
-       cd $(DIR_APP)/lib/blkid && make $(MAKETUNING)
-       cd $(DIR_APP)/lib/et && make $(MAKETUNING)
-       cd $(DIR_APP)/lib/ext2fs && make $(MAKETUNING)
-       cd $(DIR_APP)/lib/e2p && make $(MAKETUNING)
-       cd $(DIR_APP)/lib/uuid && make $(MAKETUNING)
-       cd $(DIR_APP)/misc && make $(MAKETUNING) mke2fs
-       cd $(DIR_APP) && install -m 0755 misc/mke2fs /install/misc/bin
+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
+       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
+       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="" \

diff --git a/lfs/udev b/lfs/udev
index eddb1fcf4231c047a65327236236ae4447e72ab2..0d9258c867a0a31c7558400e720376569855194c 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -32,7 +32,11 @@ THISAPP    = udev-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(LFS_PASS)" "install"
+       TARGET     = $(DIR_INFO)/$(THISAPP)-install
+else
+       TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -74,6 +78,24 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/bin udevdir=/dev
+       cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/bin udevdir=/dev install
+       rm -f /install/initrd/bin/udev* /install/initrd/usr/sbin/udev* /install/initrd/usr/bin/udev*
+       cd $(DIR_APP) && install udevstart /install/initrd/bin
+       cd /install/initrd/usr/share && rm -rf man
+       cd /install/initrd/dev && rm -f console
+       cd /install/initrd/dev && mknod -m 0600 console c 5 1
+       cd /install/initrd/dev && rm -f null
+       cd /install/initrd/dev && mknod -m 0777 null c 1 3
+       cd /install/initrd/dev && rm -f tty*
+       cd /install/initrd/dev && mknod -m 0600 tty1 c 4 1
+       cd /install/initrd/dev && mknod -m 0600 tty2 c 4 2
+       cd /install/initrd/dev && mknod -m 0600 tty3 c 4 3
+       cd /install/initrd/dev && mknod -m 0600 tty4 c 4 4
+       cd /install/initrd/dev && mknod -m 0600 tty5 c 4 5
+       cd /install/initrd/dev && mknod -m 0600 tty6 c 4 6
+else
        cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2
        install -dv /lib/{firmware,udev/devices/{pts,shm}}
        mknod -m0666 /lib/udev/devices/null c 1 3
@@ -89,7 +111,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                        extras/firmware extras/floppy extras/path_id \
                                        extras/scsi_id extras/usb_id extras/volume_id" install
        cd $(DIR_APP) && cp -v udev-config-6.2/[0-9]* /etc/udev/rules.d/
-       cd $(DIR_APP) && install -m644 -D -v docs/writing_udev_rules/index.html \
-                                       /usr/share/doc/udev-096/index.html
+endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 00f4a14726708c4623483584f8f02349649b1215..b5d65fec67980341a10027f5fa847da4b7aa6d76 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -545,14 +545,16 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  ipfiremake syslinux
-  ipfiremake as86
-  ipfiremake mbr
   ipfiremake uClibc
   installmake busybox
+  installmake udev
   installmake sysvinit
   installmake e2fsprogs
   installmake misc-progs
+exiterror STOP HERE!
+  ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   installmake slang
   installmake util-linux
   installmake newt