This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 6c22de5561913d751954df791ebf29e00c33f867 (commit) via 130d16b971b2d525762b32e335b0208fbbe58fb0 (commit) via d188e281197e6e58a78638df89558d61c57e691b (commit) via 9733068234c1e424b3da33c4f37f95fc0590b396 (commit) via c1250cd8f43a42b54360c3a6118396d67569fe83 (commit) via 528cb9a7012c6f5ff1de74acb2150f96169c6bf7 (commit) via 44b2f168bb7cae6078f2b1c5d2fd31e07652a246 (commit) via a6cbada13ea41e0891d0ab089167ecc40385661b (commit) via adc9102075571aa319b79308a77f13a2dba28c09 (commit) via b514fe3fba3fa2e631128a526a63cd1ad6a499cf (commit) via 920fb6e422d4bc38df6e855f03f3eea592ff56d2 (commit) via 726ea1a2dfe098cf2460546a8015986c72088329 (commit) via 6f5410eb5846b353985bb779d8bd3520a2ba21fa (commit) via b6fc6d25c8d1679854d0373e33f19bb2e5b5e801 (commit) via c18090e76d301d70b9e199823a8a7d2ce8f15592 (commit) via 5fa6700d8c181f33fd35db6821a68b92679cf926 (commit) via 2bcabb15f54897905a9ecb5f430e0a01c7429e6a (commit) via 02abce5474da9c48806009da8c70bcbabe1bf41f (commit) via 7aab235d4890ab127a204338c0225118d3c02f50 (commit) via e4e236cd3be1a9587611248257b10be184fd2f59 (commit) via 433aa85a7ccbe4b8347bb55f7355764d4f83a068 (commit) via a5b82ef12165ff0217318a3bd49ff359a7733c0b (commit) from 89f3d66c24acadc30c72c97fc8012e9f995e7eee (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 6c22de5561913d751954df791ebf29e00c33f867 Merge: 130d16b 89f3d66 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Dec 3 10:23:47 2011 +0100

Merge branch 'next'

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

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/53/filelists/files | 1 + config/rootfiles/core/53/update.sh | 17 ++++++++++++++--- make.sh | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files index 2d47486..741254d 100644 --- 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 a9e3dcb..dae061b 100644 --- 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 f8043b8..f59678d 100755 --- 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

hooks/post-receive -- IPFire 2.x development tree