X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=20756ab37d4a546f9601200ba646b1a5e8bc6bd0;hp=1a66343bd25cb54a581477979542815b96bd053b;hb=a50d04ab1c6a37287afa8e3390dfb2da99236bb2;hpb=9607771add0107b7e93bdccc8e3a994e968aad4a diff --git a/make.sh b/make.sh index 1a66343bd2..20756ab37d 100644 --- a/make.sh +++ b/make.sh @@ -170,7 +170,7 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - MAKETUNING="-j8" + MAKETUNING="-j12" export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD @@ -280,6 +280,7 @@ buildbase() { lfsmake2 bzip2 lfsmake2 diffutils lfsmake2 e2fsprogs + lfsmake2 ed lfsmake2 file lfsmake2 findutils lfsmake2 flex @@ -297,6 +298,7 @@ buildbase() { lfsmake2 man lfsmake2 mktemp lfsmake2 modutils + lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc lfsmake2 shadow @@ -312,9 +314,6 @@ buildbase() { buildipfire() { LOGFILE="$BASEDIR/log/_build.ipfire.log" export LOGFILE - ipfiremake inetutils - ipfiremake net-tools - ipfiremake ed ipfiremake configroot ipfiremake dhcp ipfiremake dhcpcd @@ -325,8 +324,8 @@ buildipfire() { ipfiremake ppp ipfiremake rp-pppoe ipfiremake unzip -# ipfiremake linux PASS=I # Can we remove the installer kernel? - ipfiremake linux PASS=S + ipfiremake linux SMP=1 + ipfiremake ipp2p SMP=1 # ipfiremake 3cp4218 PASS=SMP # ipfiremake amedyn PASS=SMP # ipfiremake cxacru PASS=SMP @@ -344,6 +343,7 @@ buildipfire() { # ipfiremake promise-sata-300-tx PASS=SMP ipfiremake zaptel PASS=S ipfiremake linux + ipfiremake ipp2p # ipfiremake 3cp4218 # ipfiremake amedyn # ipfiremake cxacru @@ -411,6 +411,7 @@ buildipfire() { ipfiremake ibod ipfiremake initscripts ipfiremake iptables + ipfiremake ipp2p IPT=1 ipfiremake ipac-ng ipfiremake ipaddr ipfiremake iptstate @@ -547,31 +548,38 @@ buildinstaller() { LOGFILE="$BASEDIR/log/_build.installer.log" export LOGFILE ipfiremake syslinux - ipfiremake uClibc + ipfiremake memtest + installmake linux-libc-header + installmake binutils + ipfiremake uClibc PASS=1 + ipfiremake gcc INST=1 + installmake uClibc PASS=2 + installmake gcc INST=2 + installmake uClibc PASS=3 installmake busybox installmake udev - installmake sysvinit + installmake slang + installmake newt installmake gettext - installmake e2fsprogs + installmake kbd + installmake popt + installmake sysvinit installmake misc-progs + installmake e2fsprogs + installmake reiserfsprogs installmake sysfsutils -# installmake hwinfo - installmake slang installmake util-linux - installmake reiserfsprogs - installmake newt installmake pciutils installmake pcmciautils - installmake kbd - installmake popt installmake kudzu +# installmake bootsplash installmake installer - installmake scsi.img - installmake driver.img + installmake scsi.img # this is to be deleted + installmake driver.img # this is to be deleted installmake initrd - installmake boot.img -# ipfiremake as86 -# ipfiremake mbr + installmake boot.img # this is to be deleted +# ipfiremake as86 # this is to be deleted +# ipfiremake mbr # this is to be deleted } buildpackages() { @@ -597,9 +605,9 @@ buildpackages() { beautify message DONE # Create images for install - ipfiremake pxe ipfiremake cdrom - cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1 + ipfiremake pxe + cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1 # ipfirepackages @@ -608,7 +616,7 @@ buildpackages() { rm -rf $BASEDIR/build/tmp/* # Generating total list of files - echo "`date -u '+%b %e %T'`: Generating files list from logs" | tee -a $LOGFILE + echo "Generating files list from logs" | tee -a $LOGFILE rm -f $BASEDIR/log/FILES for i in `ls -1tr $BASEDIR/log/[^_]*`; do if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then @@ -697,11 +705,14 @@ build) prepareenv fi - beautify build_stage "Building base" + beautify build_start + beautify build_stage_start "Building base" buildbase + beautify build_stage_end - beautify build_stage "Building IPFire" + beautify build_stage_start "Building IPFire" buildipfire + beautify build_stage_end # Setzen des IPFire Builds if [ "$FIREBUILD" ]; then @@ -710,11 +721,14 @@ build) echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild fi - beautify build_stage "Building installer" + beautify build_stage_start "Building installer" buildinstaller + beautify build_stage_end - beautify build_stage "Building packages" + beautify build_stage_start "Building packages" buildpackages + beautify build_stage_end + beautify build_end ;; shell) # enter a shell inside LFS chroot @@ -725,9 +739,10 @@ shell) changelog) echo -n "Loading new Changelog from SVN: " svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog - echo "Finished!" + beautify message DONE ;; clean) + echo -en "${BOLD}Cleaning build directory...${NORMAL}" for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do $LOSETUP -d $i 2>/dev/null done @@ -748,57 +763,7 @@ clean) if [ -h /tools ]; then rm -f /tools fi - ;; -newpak) - # create structure for a new package - echo -e "Name of the new package: $2" - if [ ! -f "lfs/$2" ]; then - echo "`date -u '+%b %e %T'`: Creating directory src/paks/$2" - mkdir -p src/paks/$2 - cd src/paks/$2 - echo "`date -u '+%b %e %T'`: Creating files" - cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2 - - touch ROOTFILES - touch {,un}install.sh - ## install.sh - echo '#!/bin/bash' > install.sh - echo '#' >> install.sh - echo '#################################################################' >> install.sh - echo '# #' >> install.sh - echo '# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #' >> install.sh - echo '# #' >> install.sh - echo '#################################################################' >> install.sh - echo '#' >> install.sh - echo '# Extract the files' >> install.sh - echo 'tar xfz files.tgz -C /' >> install.sh - echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2' >> install.sh - ## uninstall.sh - echo '#!/bin/bash' > uninstall.sh - echo '#################################################################' >> uninstall.sh - echo '# #' >> uninstall.sh - echo '# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #' >> uninstall.sh - echo '# #' >> uninstall.sh - echo '#################################################################' >> uninstall.sh - echo '#' >> uninstall.sh - echo '# Delete the files' >> uninstall.sh - echo '## Befehl fehlt noch' >> uninstall.sh - echo 'rm -f /opt/pakfire/installed/ROOTFILES.$2' >> uninstall.sh - echo "`date -u '+%b %e %T'`: Adding files to SVN" - cd - && svn add lfs/$2 && svn add src/paks/$2 - - echo -n "Do you want to remove the folders? [y/n]" - read REM - if [ "$REM" == "y" ]; then - echo "Removing the folders..." - svn del src/paks/$2 --force - else - echo "Folders are kept." - fi - else - echo "$2 already exists" - fi - exit 0 + beautify message DONE ;; downloadsrc) if [ ! -d $BASEDIR/cache ]; then @@ -936,10 +901,9 @@ svn) clear if [ -f /usr/bin/mcedit ]; then export EDITOR=/usr/bin/mcedit - else - if [ -f /usr/bin/nano ]; then - export EDITOR=/usr/bin/nano - fi + fi + if [ -f /usr/bin/nano ]; then + export EDITOR=/usr/bin/nano fi echo -ne "Selecting editor $EDITOR..." beautify message DONE @@ -1083,6 +1047,20 @@ batch) watch) watch_screen ;; +pxe) + case "$2" in + start) + start_tftpd + ;; + stop) + stop_tftpd + ;; + reload|restart) + reload_tftpd + ;; + esac + exit 0 + ;; "") clear svn info @@ -1108,7 +1086,7 @@ watch) $0 svn update ;; "Help") - echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|downloadsrc|shell|sync|toolchain}" + echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}" cat doc/make.sh-usage ;; "LOG: Tail") @@ -1120,8 +1098,11 @@ watch) esac done ;; +config) + make_config + ;; *) - echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|downloadsrc|shell|sync|toolchain}" + echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}" cat doc/make.sh-usage ;; esac