Merge branch 'kernel2.6.32.8' into next

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

diff --git a/make.sh b/make.sh
index 99ab98671fa1a7d09bed2b6637ba97b0b3e8d662..6b3e2b0a6936292cf35812a1c282c38cabbf40f9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.5"                                                  # Version number
+VERSION="2.6"                                                  # Version number
 CORE="37"                                                      # Core Level (Filename)
 PAKFIRE_CORE="36"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
@@ -340,40 +340,26 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake linux                     XEN=1
-  ipfiremake atl1c                     XEN=1
-  ipfiremake atl2                      XEN=1
-  ipfiremake hso                       XEN=1
-  ipfiremake e1000e                    XEN=1
-  ipfiremake r8101                     XEN=1
-  ipfiremake r8169                     XEN=1
-  ipfiremake r8168                     XEN=1
-  ipfiremake kqemu                     XEN=1
-  #ipfiremake kvm-kmod                 XEN=1
-  ipfiremake v4l-dvb                   XEN=1
-  ipfiremake madwifi                   XEN=1
-  #ipfiremake alsa                     XEN=1 KMOD=1
-  ipfiremake dahdi                     XEN=1 KMOD=1
-  ipfiremake openswan                  XEN=1 KMOD=1
-  ipfiremake mISDN                     XEN=1
-  ipfiremake compat-wireless           XEN=1
+#  ipfiremake linux                    XEN=1
+#  ipfiremake kqemu                    XEN=1
+#  #ipfiremake kvm-kmod                        XEN=1
+#  ipfiremake v4l-dvb                  XEN=1
+#  ipfiremake madwifi                  XEN=1
+#  #ipfiremake alsa                    XEN=1 KMOD=1
+#  ipfiremake dahdi                    XEN=1 KMOD=1
+#  ipfiremake openswan                 XEN=1 KMOD=1
+#  ipfiremake mISDN                    XEN=1
+#  ipfiremake compat-wireless          XEN=1
   ipfiremake linux
-  ipfiremake atl1c
-  ipfiremake atl2
-  ipfiremake hso
-  ipfiremake e1000e
-  ipfiremake r8101
-  ipfiremake r8169
-  ipfiremake r8168
   ipfiremake kqemu
-  ipfiremake kvm-kmod
+  #ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa                      KMOD=1
   ipfiremake dahdi                     KMOD=1
   ipfiremake openswan                  KMOD=1
-  ipfiremake mISDN
-  ipfiremake compat-wireless
+  #ipfiremake mISDN
+  #ipfiremake compat-wireless
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -653,7 +639,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$GIT_BRANCH" = "master" ]; then
+  if [ "$GIT_BRANCH" = "next" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
   else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
@@ -738,15 +724,15 @@ buildpackages() {
 
   ipfirepackages
 
-  # Check if there is a loop device for building in virtual environments
-  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
-        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
-       ipfiremake xen-image ED=$IPFVER
-       rm -rf $LFS/install/packages/linux-xen-*.ipfire
-       rm -rf $LFS/install/packages/meta-linux-xen
-  fi
-  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+#  # Check if there is a loop device for building in virtual environments
+#  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+#        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
+#        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
+#      ipfiremake xen-image ED=$IPFVER
+#      rm -rf $LFS/install/packages/linux-xen-*.ipfire
+#      rm -rf $LFS/install/packages/meta-linux-xen
+#  fi
+#  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 
   # Cleanup
   stdumount