Zwischencommit... ISO wird gebaut!

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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f39f61f9b0d0f537a5897afb0456100e308f95aa..09583c0d2cac8f4a069ce05b497c46166aff4cd9 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -30,7 +30,6 @@
 * amavisd-new-2.4.1
 * applejuice-0.30
 * arping-2.05
-* as86-0.16.17
 * asterisk-1.2.13
 * autoconf-2.59
 * automake-1.9.6
@@ -41,7 +40,6 @@
 * bison-2.2
 * bootsplash-3.2
 * bridge-utils-1.1
-* busybox-0.60.5
 * busybox-1.2.2
 * bzip2-1.0.3
 * capi4k-utils-2005-07-18
@@ -137,7 +135,6 @@
 * make-3.80
 * man-db-2.4.3
 * man-pages-2.34
-* mbr-1.1.8
 * mc-4.6.0
 * mingetty_1.07
 * misc-progs

diff --git a/lfs/cdrom b/lfs/cdrom
index 1ed3c6ad96072a040eebbf19751e550a814998de..0b6125e20f33716245844b637c7ec3656c547cd6 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -103,11 +103,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp $(DIR_DL)/rawrite.exe                                /install/cdrom/dosutils
        unzip -j -L $(DIR_DL)/rawwritewin*.zip -x "*.txt" -d /install/cdrom/dosutils
 
-       # make the ISO
+       # Make the ISO
        mkdir -p /install/cdrom/boot/isolinux; \
        dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog; \
        cp /install/images/cdinitrd.gz              /install/cdrom/boot/isolinux/instroot.gz; \
-       cp /boot/vmlinuz-installer                  /install/cdrom/boot/isolinux/vmlinuz; \
+       cp /boot/vmlinuz-$(KVER)                    /install/cdrom/boot/isolinux/vmlinuz; \
        cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/cdrom/boot/isolinux/isolinux.cfg; \
        cp $(DIR_SRC)/config/kernel/install-message /install/cdrom/boot/isolinux/message; \
        cp /usr/lib/syslinux/isolinux.bin           /install/cdrom/boot/isolinux/isolinux.bin; \

diff --git a/lfs/driver.img b/lfs/driver.img
index f54d220feb9a3be1e53ef6085267b6c432a39961..90732c1a9cafb47a003b809f56ff686c361df8bd 100644 (file)
--- a/lfs/driver.img
+++ b/lfs/driver.img
@@ -49,68 +49,29 @@ md5 :
 
 $(TARGET) :
        @$(PREBUILD)
-       -strip --strip-all   /install/misc/bin/*
-
        # make new dependencies 
        depmod -a -F /boot/System.map-$(KVER) $(KVER)
        depmod -a -F /boot/System.map-$(KVER)-smp $(KVER)-smp
 
        # Create drivers floppy
        cd /tmp && rm -rf drivers.tgz drivers.tar bin lib etc var
-       cd / && tar -cf /tmp/drivers.tar  \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/acpi/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/base/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/block/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/bluetooth/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/char/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/ide/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/ieee1394/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/isdn/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/md/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/net/ppp*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/net/slip*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/net/slhc*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/net/tun*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/net/imq*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/net/wireless/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/parport/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/scsi/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/message/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/mmc/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/input/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/usb/storage/*' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/usb/host/*' \
-           --exclude='lib/modules/$(KVER)/kernel/arch/*' \
-           --exclude='lib/modules/$(KVER)/kernel/fs/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/8021q/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/atm/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/bluetooth/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/bridge/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/ieee80211/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/ipsec/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/ipv4/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/key/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/sched/*' \
-           --exclude='lib/modules/$(KVER)/kernel/net/xfrm/*' \
-           --exclude='lib/modules/$(KVER)/*map' \
-           --exclude='lib/modules/$(KVER)/misc/*' \
-           --exclude='lib/modules/$(KVER)/extra/*' \
-           --exclude='lib/modules/$(KVER)/pcmcia/*' \
-           --exclude='lib/modules/$(KVER)/build' \
-           --exclude='lib/modules/$(KVER)/kernel/drivers/atm/*' \
-           --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{3cp4218.o.gz,acm.o.gz,amedyn.o.gz,cxacru.o.gz,speedtch.o.gz,hid.o.gz,usbcore.o.gz} \
-           --exclude='lib/modules/$(KVER)/modules.*' \
-           lib/modules/$(KVER)
+       cd / && tar -cf /tmp/drivers.tar \
+               --exclude=lib/modules/$(KVER)/kernel/{arch,fs} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,hwmon,ide} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/{ieee1394,isdn,mmc,scsi,md,message,video} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/net/{wan,ppp*,slip*,slhc*,tun*,wireless} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{atm,input,storage,host} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{3cp4218.ko,acm.ko,amedyn.ko,cxacru.ko} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{speedtch.ko,hid.ko,usbcore.ko,at76c50*.ko} \
+               --exclude=lib/modules/$(KVER)/kernel/net/{8021q,atm,bluetooth,bridge,ieee80211,ipsec,ipv4} \
+               --exclude=lib/modules/$(KVER)/kernel/net/{wanrouter,netfilter,sched} \
+               --exclude=lib/modules/$(KVER)/{build,extra,misc,modules.*,source} \
+               lib/modules/$(KVER)
        cd /tmp && tar xf drivers.tar
-       cd /tmp && mkdir -p {bin,etc/pcmcia,var/lib/pcmcia,var/run}
-       cd /tmp && cp -aR /install/misc/bin/* bin
-#      cd /tmp && cp -r /etc/pcmcia/{config*,net*} etc/pcmcia
-       # cardmgr wants to execute these to bring up the card, we'll
-       # create blank ones as we'll bring them up ourselves
-#      cd /tmp/etc/pcmcia && rm -f network 
-#      cd /tmp/etc/pcmcia && touch network
-#      cd /tmp/etc/pcmcia && chmod +x network
-       cd /tmp && tar -cf - bin/ etc/pcmcia var lib/modules/$(KVER) | gzip -9 -c > drivers.tgz
+       cd /tmp && mkdir -p {bin,var/run}
+       cd /tmp && tar -cf - bin var lib/modules/$(KVER) | gzip -9 -c > drivers.tgz
+
+       ls -l /tmp/drivers.tgz
 
        dd if=/tmp/drivers.tgz of=/install/images/drivers-$(VERSION).img bs=2880k count=1 conv=sync
        rm -rf /tmp/drivers.tgz /tmp/drivers.tar /tmp/bin /tmp/lib

diff --git a/lfs/initrd b/lfs/initrd
index e2510d1855c08637aa013e53002985f891c33e96..c0d71434028f869fa55b8232bb7e7d1b0d534610 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -51,47 +51,62 @@ md5 :
 $(TARGET) :
        @$(PREBUILD)
        rm -f /install/images/{cdinitrd,cdinitrd.gz,fdinitrd,fdinitrd.gz}
-       -strip --strip-all   /install/misc/bin/*
-       -strip --strip-all   /install/initrd/bin/*
-       -strip --strip-debug /install/initrd/lib/*
 
        # Finish up initrd directory
-       -mkdir -p /install/initrd/{etc,lib/modules/$(KVER)/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run} && \
-       ln -sf /bin /install/initrd/sbin
-#      cd /install/initrd/dev && /dev/make_devices 
+       -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/CVS/
-       cd /install/initrd/dev && ln -sf fd0 floppy
+       mv -f /install/initrd/etc/fstab /install/initrd/etc/fstab.boot
+       cd /install/initrd/etc && ln -s /tmp/fstab fstab
+       rm -rf /install/initrd/etc{,/udev,/udev/rules.d}/.svn
+       rm -rf /install/initrd/usr/share/man
        chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc
        cp -f /usr/share/terminfo/l/linux /install/initrd/usr/share/terminfo/l
 
        # Extra modules
        -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/scsi
        cp -f /lib/modules/$(KVER)/kernel/drivers/scsi/{scsi_mod.ko,sd_mod.ko,sr_mod.ko} \
-           /install/initrd/lib/modules/$(KVER)/kernel/drivers/scsi/
-       -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/storage/
+               /install/initrd/lib/modules/$(KVER)/kernel/drivers/scsi/
+
+       -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/storage
        cp -f /lib/modules/$(KVER)/kernel/drivers/usb/storage/*.ko \
-           /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/storage/
+               /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/storage/
+
+       -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/host
+       cp -f /lib/modules/$(KVER)/kernel/drivers/usb/host/*.ko \
+               /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/host
 
-       -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/host/
-       cp -f /lib/modules/$(KVER)/kernel/drivers/usb/host/ehci* \
-             /lib/modules/$(KVER)/kernel/drivers/usb/input/usbhid.ko \
-             /lib/modules/$(KVER)/kernel/drivers/usb/core/usbcore.ko \
-           /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/
+       -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/input
+       cp -f /lib/modules/$(KVER)/kernel/drivers/usb/input/usbhid.ko \
+               /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/input
 
-#      -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/input
-#      cp -f /lib/modules/$(KVER)/kernel/drivers/input/{input.ko,keybdev.ko} \
-#          /install/initrd/lib/modules/$(KVER)/kernel/drivers/input/
+       -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/core
+       cp -f /lib/modules/$(KVER)/kernel/drivers/usb/core/*.ko \
+               /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/core
 
-#      -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/pnp
-#      cp -f /lib/modules/$(KVER)/kernel/drivers/pnp/* \
-#          /install/initrd/lib/modules/$(KVER)/kernel/drivers/pnp/
+       # File system
+       -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/fs
+       cp -rf /lib/modules/$(KVER)/kernel/fs/* /install/initrd/lib/modules/$(KVER)/kernel/fs
 
-       cp -f /lib/modules/$(KVER)/modules.* /install/initrd/lib/modules/$(KVER)/
+       cp -f /lib/modules/$(KVER)/modules.* /install/initrd/lib/modules/$(KVER)
 
+       cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
+
+       cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
+       
        # Floppy initrd
        -mkdir -p /install/{images,mnt}
-       RAMDISK_SIZE=`grep CONFIG_BLK_DEV_RAM_SIZE $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) | sed -e 's/CONFIG_BLK_DEV_RAM_SIZE=//'` && \
+       rm -rf /install/mnt/*
+
+       cp -aR /install/initrd/* /install/mnt
+       # cp -a /install/misc/bin/* /install/mnt/bin
+
+       # make new dependencies
+       depmod -a -F /boot/System.map-$(KVER) $(KVER)
+       touch /install/mnt/FLOPPYBOOT
+
+       RAMDISK_SIZE=8192 && \
            dd if=/dev/zero of=/install/images/fdinitrd bs=1k count=$${RAMDISK_SIZE}
        for i in `seq 0 7`; do \
            if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
@@ -104,16 +119,12 @@ $(TARGET) :
            mount -t ext2 $$LOOPDEV /install/mnt && \
            rm -rf /install/mnt/lost+found && \
            cp -aR /install/initrd/* /install/mnt/ && \
-           umount /install/mnt && \
+           cd /install/mnt/ && find ./ -ls > $(DIR_INFO)/_build.fdinitrd && \
+           cd / && umount /install/mnt && \
            losetup -d $$LOOPDEV
        gzip -9 /install/images/fdinitrd
 
-       # CDRom initrd, add vfat modules
-       -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/fs
-       cp -fR /lib/modules/$(KVER)/kernel/fs/* \
-           /install/initrd/lib/modules/$(KVER)/kernel/fs/
-
-       RAMDISK_SIZE=`grep CONFIG_BLK_DEV_RAM_SIZE $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) | sed -e 's/CONFIG_BLK_DEV_RAM_SIZE=//'` && \
+       RAMDISK_SIZE=11264 && \
            dd if=/dev/zero of=/install/images/cdinitrd bs=1k count=$${RAMDISK_SIZE}
        for i in `seq 0 7`; do \
            if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
@@ -126,9 +137,9 @@ $(TARGET) :
            mount -t ext2 $$LOOPDEV /install/mnt && \
            rm -rf /install/mnt/lost+found && \
            cp -aR /install/initrd/* /install/mnt/ && \
-           cd /install/mnt && tar xfz /install/images/drivers-$(VERSION).img # && \
-#          cd /install/mnt && tar xfz /install/images/scsidrv-$(VERSION).img && \
-           cp -a  /install/misc/bin/* /install/mnt/bin && \
+           cd /install/mnt && tar xfz /install/images/drivers-$(VERSION).img && \
+           cd /install/mnt && tar xfz /install/images/scsidrv-$(VERSION).img && \
+           cd /install/mnt/ && find ./ -ls > $(DIR_INFO)/_build.cdinitrd && \
            touch /install/mnt/CDROMBOOT && \
            cd / && umount /install/mnt && \
            losetup -d $$LOOPDEV

diff --git a/lfs/newt b/lfs/newt
index b8ee2db8d982b392105590cbf5e98d7180e4d2ec..05d9c6d1be88ba55c1e7e82d93edf4fb2f641ab3 100644 (file)
--- a/lfs/newt
+++ b/lfs/newt
@@ -86,15 +86,16 @@ ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/install/include/slang%' Makefile
        cd $(DIR_APP) && make libnewt.a
        cd $(DIR_APP) && install -m 0644 libnewt.a /install/lib
-       cd $(DIR_APP) && install -m 0644 newt.h /install/include
+       -mkdir -p /install/include
+       cd $(DIR_APP) && install -m 0644 newt.h /install/include/newt.h
 else
        cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support
        cd $(DIR_APP) && sed -i \
            -e 's/^PYVER.*$$/PYVER = 2.4/' \
            -e 's/^all:.*$$/all: _snackmodule.so/' Makefile
-       cd $(DIR_APP) && echo 'install-snack: _snackmodule.so'                                  >> Makefile
-       cd $(DIR_APP) && echo ' install -s -m 644 _snackmodule.so $$(instroot)/$$(pythonbindir)'>> Makefile
-       cd $(DIR_APP) && echo ' install -m 644 snack.py $$(instroot)/$$(pythonbindir)'          >> Makefile
+       cd $(DIR_APP) && echo 'install-snack: _snackmodule.so'                                                  >> Makefile
+       cd $(DIR_APP) && echo ' install -s -m 644 _snackmodule.so $$(instroot)/$$(pythonbindir)'        >> Makefile
+       cd $(DIR_APP) && echo ' install -m 644 snack.py $$(instroot)/$$(pythonbindir)'                  >> Makefile
        cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS)" make install-snack
        cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS)" make install-utf8sh
        cd $(DIR_APP) && install -m 0644 newt.h /usr/include

diff --git a/lfs/scsi.img b/lfs/scsi.img
index 988ee5eabce16dab0f4a5be89c68b79525cb64b1..0940b58d733cd8837fbb7d9713b0dce96b6e8141 100644 (file)
--- a/lfs/scsi.img
+++ b/lfs/scsi.img
@@ -54,18 +54,18 @@ $(TARGET) :
        -mkdir -p /install/images
        cd /tmp && rm -rf scsi.tgz scsi.tar bin etc lib var
 
-       cd / && tar -cf /tmp/scsi.tar lib/modules/$(KVER)/kernel/drivers/{scsi,pcmcia,message/fusion} lib/modules/$(KVER)/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} lib/modules/$(KVER)/kernel/drivers/ide
+       cd / && tar -cf /tmp/scsi.tar \
+               lib/modules/$(KVER)/kernel/drivers/{scsi,message/fusion} \
+               lib/modules/$(KVER)/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} \
+               lib/modules/$(KVER)/kernel/drivers/ide \
+               lib/modules/$(KVER)/kernel/drivers/cdrom \
+               lib/modules/$(KVER)/kernel/drivers/ieee1394
        cd /tmp && tar xf scsi.tar
        cd /tmp && rm -f lib/modules/$(KVER)/kernel/drivers/message/fusion/mptlan*
-       cd /tmp && mkdir -p {bin,etc/pcmcia/scsi,var/lib/pcmcia,var/run}
-       cd /tmp && cp -aR /install/misc/bin/* bin
-#      cd /tmp && cp -r /etc/pcmcia/{config*,scsi*} etc/pcmcia/scsi
-       # cardmgr wants to execute these to bring up the card, we'll
-       # create blank ones as we'll bring them up ourselves
-#      cd /tmp/etc/pcmcia/scsi && rm -f scsi
-#      cd /tmp/etc/pcmcia/scsi && touch scsi
-#      cd /tmp/etc/pcmcia/scsi && chmod +x scsi
-       cd /tmp && tar -cf - bin/ etc/pcmcia var lib/modules/$(KVER) | gzip -9 -c > scsi.tgz
+       cd /tmp && mkdir -p {bin,var/run}
+       cd /tmp && tar -cf - bin var lib/modules/$(KVER) | gzip -9 -c > scsi.tgz
+
+       ls -l /tmp/scsi.tgz
 
        dd if=/tmp/scsi.tgz of=/install/images/scsidrv-$(VERSION).img bs=2880k count=1 conv=sync
        rm -f /tmp/scsi.tgz

diff --git a/lfs/syslinux b/lfs/syslinux
index 4a2f28489fb16d4f9748890ab573ea954c36c8d2..063fa6c5116d9fe58458faf34b4790f54f44b7e0 100644 (file)
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -72,8 +72,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-3.11-nossp.patch
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-3.11-nopie.patch
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 727989613c1f4ea729bfd1fc9c630b38a29041d8..9ced61f21fcb3866377ddb16f35b1ed70313bcba 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j8"
+    MAKETUNING="-j4"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -545,6 +545,7 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
+  ipfiremake syslinux
   ipfiremake uClibc
   installmake busybox
   installmake udev
@@ -558,14 +559,12 @@ buildinstaller() {
   installmake newt
   installmake pciutils
   installmake pcmciautils
+  installmake kbd
   installmake installer
   installmake scsi.img
   installmake driver.img
   installmake initrd
   installmake boot.img
-  installmake kbd
-# exiterror STOP HERE!
-#  ipfiremake syslinux
 #  ipfiremake as86
 #  ipfiremake mbr
 }