Updated kvm-kmod (2.6.34.1).

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

diff --git a/make.sh b/make.sh
index 15f569ba7fee4455d0d7763e3f346d06927428af..7f669c99a9a7883a9f51deee3264832357cc8907 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.7"                                                  # Version number
-CORE="40"                                                      # Core Level (Filename)
-PAKFIRE_CORE="39"                                              # Core Level (PAKFIRE)
+VERSION="2.8test"                                              # Version number
+CORE="41"                                                      # Core Level (Filename)
+PAKFIRE_CORE="40"                                              # 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
@@ -342,22 +342,23 @@ buildipfire() {
   ipfiremake which
   ipfiremake xz
   ipfiremake linux-firmware
-#  ipfiremake linux                    XEN=1
-#  ipfiremake kqemu                    XEN=1
-#  ipfiremake v4l-dvb                  XEN=1
-#  ipfiremake madwifi                  XEN=1
-#  ipfiremake mISDN                    XEN=1
-#  ipfiremake dahdi                    XEN=1 KMOD=1
-#  ipfiremake cryptodev                        XEN=1
-#  ipfiremake compat-wireless          XEN=1
-#  ipfiremake r8169                    XEN=1
-#  ipfiremake r8168                    XEN=1
-#  ipfiremake r8101                    XEN=1
-#  ipfiremake e1000                    XEN=1
-#  ipfiremake e1000e                   XEN=1
+  ipfiremake linux                     XEN=1
+  ipfiremake kqemu                     XEN=1
+  ipfiremake v4l-dvb                   XEN=1
+  ipfiremake madwifi                   XEN=1
+  ipfiremake mISDN                     XEN=1
+  ipfiremake dahdi                     XEN=1 KMOD=1
+  ipfiremake cryptodev                 XEN=1
+  ipfiremake compat-wireless           XEN=1
+  ipfiremake r8169                     XEN=1
+  ipfiremake r8168                     XEN=1
+  ipfiremake r8101                     XEN=1
+  ipfiremake e1000                     XEN=1
+  ipfiremake e1000e                    XEN=1
+  ipfiremake igb                       XEN=1
   ipfiremake linux
   ipfiremake kqemu
-#  ipfiremake kvm-kmod
+  ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa                      KMOD=1
@@ -370,6 +371,7 @@ buildipfire() {
   ipfiremake r8101
   ipfiremake e1000
   ipfiremake e1000e
+  ipfiremake igb
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -415,7 +417,6 @@ buildipfire() {
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
-  ipfiremake squashfstools
   ipfiremake reiserfsprogs
   ipfiremake xfsprogs
   ipfiremake sysfsutils
@@ -638,12 +639,15 @@ buildipfire() {
   ipfiremake asterisk
   ipfiremake lcr
   ipfiremake usb_modeswitch
+  ipfiremake usb_modeswitch_data
   ipfiremake zerofree
   ipfiremake mdadm
   ipfiremake eject
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
+  ipfiremake tcl
+  ipfiremake imspector
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -667,32 +671,6 @@ buildinstaller() {
   ipfiremake as86
   ipfiremake mbr
   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
-#  ipfiremake busybox
-#  installmake udev
-#  installmake slang
-#  installmake newt
-#  installmake gettext
-#  installmake kbd
-#  installmake popt
-#  installmake sysvinit
-#  installmake misc-progs
-#  installmake reiserfsprogs
-#  installmake sysfsutils
-#  installmake util-linux
-#  installmake pciutils
-#  installmake zlib
-#  installmake mtd
-#  installmake wget
-#  installmake hwdata
-#  installmake kudzu
-#  installmake pcmciautils
   ipfiremake installer
   installmake strip
   ipfiremake initrd
@@ -1018,11 +996,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