]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - make.sh
Zwischencommit fuer LFS.
[people/pmueller/ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index 0a01c17ff2eeddd7b85b4eff48f5558d068d8a6b..e76dc57d406861cf2cecd16a49b1dbaff206dce9 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -33,7 +33,9 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 
-# Setzen des IPFire Builds
+IPFVER="full"                          # Which version should be compiled? (full|light|voice)
+
+# Set an information about the build number
 if [ -e ./.svn ]; then
        FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'`
 fi
@@ -64,7 +66,13 @@ mkdir $BASEDIR/log/ 2>/dev/null
 if [ -f .config ]; then
        . .config
 else
-       make_config
+       echo -e  "${BOLD}No configuration found!${NORMAL}"
+       echo -ne "Do you want to create one (y/N)?"
+       read CREATE_CONFIG
+       echo ""
+       if [ "$CREATE_CONFIG" == "y" ]; then
+               make_config
+       fi
 fi
 
 prepareenv() {
@@ -192,7 +200,9 @@ prepareenv() {
     mount --bind $BASEDIR/src    $BASEDIR/build/usr/src/src
 
     # This is a temporary hack!!!
-    cp -f /bin/hostname /tools/bin/hostname 2>/dev/null
+    if [ ! -f /tools/bin/hostname ]; then
+      cp -f /bin/hostname /tools/bin/hostname 2>/dev/null
+    fi
 
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
@@ -246,7 +256,6 @@ buildbase() {
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2
-#    lfsmake2 makedev
     lfsmake2 linux-libc-header
     lfsmake2 man-pages
     lfsmake2 glibc
@@ -298,16 +307,14 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
-####
-#    lfsmake2 net-tools
-#    lfsmake2 inetutils
-#    lfsmake2 ed
-#    lfsmake2 procinfo
 }
 
 buildipfire() {
   LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE
+  ipfiremake inetutils
+  ipfiremake net-tools
+  ipfiremake ed
   ipfiremake configroot
   ipfiremake dhcp
   ipfiremake dhcpcd
@@ -318,72 +325,72 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-  ipfiremake linux                     PASS=ipfire SMP=installer
-  ipfiremake linux                     PASS=ipfire SMP=1
-#  ipfiremake 3cp4218                  SMP=1
-#  ipfiremake amedyn                   SMP=1
-#  ipfiremake cxacru                   SMP=1
-#  ipfiremake eagle                    SMP=1
-#  ipfiremake cnx_pci                  SMP=1
-#  ipfiremake fcdsl                    SMP=1
-#  ipfiremake fcdsl2                   SMP=1
-#  ipfiremake fcdslsl                  SMP=1
-#  ipfiremake fcdslusb         SMP=1
-#  ipfiremake fcdslslusb               SMP=1
-#  ipfiremake fcpci                    SMP=1
-#  ipfiremake fcclassic                SMP=1
-#  ipfiremake pulsar                   SMP=1
-#  ipfiremake unicorn                  SMP=1
-#  ipfiremake promise-sata-300-tx      SMP=1
-  ipfiremake linux                     PASS=ipfire
-#  ipfiremake 3cp4218  
-#  ipfiremake amedyn   
-#  ipfiremake cxacru   
-#  ipfiremake eciadsl  
-#  ipfiremake eagle    
-#  ipfiremake speedtouch       
-#  ipfiremake cnx_pci  
-#  ipfiremake fcdsl    
-#  ipfiremake fcdsl2   
-#  ipfiremake fcdslsl  
-#  ipfiremake fcdslusb         
-#  ipfiremake fcdslslusb 
+  ipfiremake linux                     PASS=I
+  ipfiremake linux                     PASS=S
+#  ipfiremake 3cp4218          PASS=SMP
+#  ipfiremake amedyn                   PASS=SMP
+#  ipfiremake cxacru                   PASS=SMP
+#  ipfiremake eagle                    PASS=SMP
+#  ipfiremake cnx_pci          PASS=SMP
+#  ipfiremake fcdsl                    PASS=SMP
+#  ipfiremake fcdsl2                   PASS=SMP
+#  ipfiremake fcdslsl          PASS=SMP
+#  ipfiremake fcdslusb         PASS=SMP
+#  ipfiremake fcdslslusb               PASS=SMP
+#  ipfiremake fcpci                    PASS=SMP
+#  ipfiremake fcclassic                PASS=SMP
+#  ipfiremake pulsar                   PASS=SMP
+#  ipfiremake unicorn          PASS=SMP
+#  ipfiremake promise-sata-300-tx      PASS=SMP
+  ipfiremake linux
+#  ipfiremake 3cp4218
+#  ipfiremake amedyn
+#  ipfiremake cxacru
+#  ipfiremake eciadsl
+#  ipfiremake eagle
+#  ipfiremake speedtouch
+#  ipfiremake cnx_pci
+#  ipfiremake fcdsl
+#  ipfiremake fcdsl2
+#  ipfiremake fcdslsl
+#  ipfiremake fcdslusb
+#  ipfiremake fcdslslusb
 #  ipfiremake fcpci
 #  ipfiremake fcclassic
-#  ipfiremake pulsar   
+#  ipfiremake pulsar
 #  ipfiremake unicorn
 #  ipfiremake promise-sata-300-tx
-  ipfiremake pcmcia-cs
+#  ipfiremake pcmciautils
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
+  ipfiremake pam
   ipfiremake openssl
   ipfiremake python
   ipfiremake libnet
+  ipfiremake libjpeg
   ipfiremake libpng
   ipfiremake libtiff
-  ipfiremake libjpeg
   ipfiremake lcms
   ipfiremake libmng
   ipfiremake freetype
   ipfiremake gd
   ipfiremake popt
+  ipfiremake pcre
   ipfiremake slang
   ipfiremake newt
-  ipfiremake libcap
+# ipfiremake libcap
   ipfiremake pciutils
-  ipfiremake pcre
-  ipfiremake readline
   ipfiremake libxml2
-  ipfiremake berkeley
-  ipfiremake BerkeleyDB ## The Perl module
+  ipfiremake BerkeleyDB
   ipfiremake mysql
-  ipfiremake saslauthd PASS=1
+  ipfiremake cyrus-sasl
   ipfiremake openldap
+#  ipfiremake cyrus-sasl PASS=L # Doesn't work yet. Thereby there's the question: Do we really need this?
   ipfiremake apache2
   ipfiremake php
   ipfiremake subversion
-  ipfiremake apache2 PASS=CONFIG
+  ipfiremake apache2 PASS=C
   ipfiremake arping
   ipfiremake beep
   ipfiremake bind
@@ -394,7 +401,7 @@ buildipfire() {
   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron
-  ipfiremake perl-GD
+  ipfiremake GD
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake ibod
@@ -402,9 +409,9 @@ buildipfire() {
   ipfiremake iptables
   ipfiremake ipac-ng
   ipfiremake ipaddr
-  ipfiremake iproute2
   ipfiremake iptstate
-  ipfiremake iputils
+#  ipfiremake iputils
+exit 1
   ipfiremake l7-protocols
   ipfiremake isapnptools
   ipfiremake isdn4k-utils
@@ -469,7 +476,6 @@ buildipfire() {
   ipfiremake openvpn
   ipfiremake pkg-config
   ipfiremake glib
-  ipfiremake pam
   ipfiremake pammysql
   ipfiremake saslauthd PASS=2
   ipfiremake xinetd
@@ -654,7 +660,6 @@ ipfirepackages() {
   ipfiredist lame
   ipfiredist libmad
   ipfiredist libogg
-  ipfiredist libtiff
   ipfiredist libvorbis
   ipfiredist mailx
   ipfiredist mldonkey
@@ -944,15 +949,23 @@ svn)
          ;;
          commit|ci)
                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
+               echo -ne "Selecting editor $EDITOR..."
+               beautify message DONE
                if [ -e /sbin/yast ]; then
                        if [ "`echo $SVN_REVISION | cut -c 3`" -eq "0" ]; then
                                $0 changelog
                        fi
                fi
-               echo "Upload the changed files..."
-               sleep 1
                svn commit
                $0 svn up
+               $0 uploadsrc
          ;;
          dist)
                if [ $3 ]; then
@@ -1085,7 +1098,7 @@ batch)
 watch)
        watch_screen
        ;;
-*)
+"")
        clear
        svn info
        select name in "Exit" "IPFIRE: Prefetch" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help"
@@ -1106,25 +1119,9 @@ watch)
        "IPFIRE: Clean")
                $0 clean
                ;;
-       "SVN: Commit")
-               if [ -f /usr/bin/mcedit ]; then
-                       export EDITOR=/usr/bin/mcedit
-               fi
-               if [ -f /usr/bin/nano ]; then
-                       export EDITOR=/usr/bin/nano
-               fi
-               $0 svn commit
-               $0 uploadsrc
-               ;;
        "SVN: Update")
                $0 svn update
                ;;
-       "SVN: Status")
-               svn status # | grep -v ^?
-               ;;
-       "SVN: Diff")
-               $0 svn diff
-               ;;
        "Help")
                echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}"
                cat doc/make.sh-usage
@@ -1138,4 +1135,8 @@ watch)
        esac
        done
        ;;
+*)
+       echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}"
+       cat doc/make.sh-usage
+       ;;
 esac