X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=15f569ba7fee4455d0d7763e3f346d06927428af;hp=50f0f6f86ac7b60a7a3a118619de4e20adaa8b2b;hb=dd667dd58707ff7498a6d83ae89f752875fbe56e;hpb=ebf6c2890f9ef757d08b3c6bb0520aecd9edca82

diff --git a/make.sh b/make.sh
index 50f0f6f86a..15f569ba7f 100755
--- 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="40"							# Core Level (Filename)
+PAKFIRE_CORE="39"						# 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,22 @@ 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 linux
   ipfiremake kqemu
-  ipfiremake kvm-kmod
+#  ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
@@ -373,6 +373,9 @@ buildipfire() {
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
+
+  installmake strip
+
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
@@ -664,36 +667,35 @@ 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
-  installmake busybox
-  installmake udev
-  installmake slang
-  installmake newt
-  installmake gettext
-  installmake kbd
-  installmake popt
-  installmake sysvinit
-  installmake misc-progs
-  installmake libaal
-  installmake reiser4progs
-  installmake reiserfsprogs
-  installmake sysfsutils
-  installmake util-linux
-  installmake pciutils
-  installmake zlib
-  installmake mtd
-  installmake wget
-  installmake hwdata
-  installmake kudzu
-  installmake pcmciautils
-  installmake installer
-  installmake initrd
+#  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
 }
 
 buildpackages() {
@@ -701,7 +703,6 @@ buildpackages() {
   export LOGFILE
   echo "... see detailed log in _build.*.log files" >> $LOGFILE
 
-  installmake strip
   
   # Generating list of packages used
   echo -n "Generating packages list from logs" | tee -a $LOGFILE