Merge branch 'next'

Conflicts:
	lfs/e1000
	lfs/e1000e
	lfs/igb
	lfs/lcd4linux

diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files
index 2d47486a7904aad0f5117b8645e401c9cfe09f3c..741254d8e3c9ae98cc88ed6a08376836211b17c0 100644 (file)
--- a/config/rootfiles/core/53/filelists/files
+++ b/config/rootfiles/core/53/filelists/files
@@ -23,3 +23,4 @@ usr/local/sbin/setup
 var/ipfire/main/routing
 var/ipfire/menu.d/30-network.menu
 opt/pakfire/etc/pakfire.conf
+usr/local/bin/backupiso

diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh
index a9e3dcbe89ba806d112409eed51bed3efc2cc3b8..dae061b7f1f13272327f2ca8987d15e80cf4e7e3 100644 (file)
--- a/config/rootfiles/core/53/update.sh
+++ b/config/rootfiles/core/53/update.sh
@@ -76,9 +76,20 @@ fi
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 #Rebuild module dep's
-depmod 2.6.32.45-ipfire     >/dev/null 2>&1
-depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
-depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire     >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#Rebuild initrd's because some compat-wireless modules are inside
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+fi
+if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+fi
+
+sync
 
 #
 # After pakfire has ended run it again and update the lists and do upgrade

diff --git a/make.sh b/make.sh
index f8043b81baf3fac1ea587e6abdd6a5d76764290e..f59678d71a854c2f8926ba5edf4493a227190225 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -751,7 +751,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" = "next" ]; then
+  if [ "$GIT_BRANCH" = "master" -o "$GIT_BRANCH" = "next" ]; then
        echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
   else
        echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release