New package: miniupnpd.

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index eb63bb4ff9ed24673627bcf15ea31ace6f58fe37..479cae58e2e37cebdc0b940df20cc4f8e5348a0a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.7"                                                  # Version number
-CORE="39"                                                      # Core Level (Filename)
-PAKFIRE_CORE="38"                                              # Core Level (PAKFIRE)
+CORE="42"                                                      # Core Level (Filename)
+PAKFIRE_CORE="41"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=2
+TOOLCHAINVER=3
 IPFVER="full"                          # Which versions should be compiled? (full|devel)
 
 # Debian specific settings
@@ -219,6 +219,7 @@ prepareenv() {
 
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
+    export CCACHE_COMPRESS=1
     export CCACHE_HASHDIR=1
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
@@ -231,7 +232,7 @@ buildtoolchain() {
     ORG_PATH=$PATH
     NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
     export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
-    lfsmake1 ccache
+    lfsmake1 ccache    PASS=1
     lfsmake1 binutils  PASS=1
     lfsmake1 gcc               PASS=1
     export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@ -243,6 +244,7 @@ buildtoolchain() {
     lfsmake1 dejagnu
     lfsmake1 gcc               PASS=2
     lfsmake1 binutils  PASS=2
+    lfsmake1 ccache    PASS=2
     lfsmake1 ncurses
     lfsmake1 bash
     lfsmake1 bzip2
@@ -337,7 +339,6 @@ buildipfire() {
   ipfiremake libusb
   ipfiremake libpcap
   ipfiremake ppp
-  ipfiremake rp-pppoe
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
@@ -356,6 +357,7 @@ buildipfire() {
   ipfiremake r8101                     XEN=1
   ipfiremake e1000                     XEN=1
   ipfiremake e1000e                    XEN=1
+  ipfiremake igb                       XEN=1
   ipfiremake linux
   ipfiremake kqemu
   ipfiremake kvm-kmod
@@ -371,6 +373,7 @@ buildipfire() {
   ipfiremake r8101
   ipfiremake e1000
   ipfiremake e1000e
+  ipfiremake igb
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -545,6 +548,7 @@ buildipfire() {
   ipfiremake ipfireseeder
   ipfiremake rsync
   ipfiremake tcpwrapper
+  ipfiremake libevent
   ipfiremake portmap
   ipfiremake nfs
   ipfiremake nmap
@@ -625,7 +629,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  ipfiremake open-vm-tools
+  ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
@@ -641,6 +645,10 @@ buildipfire() {
   ipfiremake mdadm
   ipfiremake eject
   ipfiremake pound
+  ipfiremake minicom
+  ipfiremake ddrescue
+  ipfiremake imspector
+  ipfiremake miniupnpd
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -680,8 +688,6 @@ buildinstaller() {
   installmake popt
   installmake sysvinit
   installmake misc-progs
-  installmake libaal
-  installmake reiser4progs
   installmake reiserfsprogs
   installmake sysfsutils
   installmake util-linux
@@ -1017,11 +1023,12 @@ uploadsrc)
                beautify message FAIL
                exit 1
        fi
+
        URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-       REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+       REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
 
        cd $BASEDIR/cache/
-       for file in $(ls -1); do
+       for file in $(ls -1 --ignore=toolchains); do
                grep -q "$file" <<<$REMOTE_FILES && continue
                NEW_FILES="$NEW_FILES $file"
        done