Updated kernel to 2.6.27.31

Updated compat-wireless to 2009-08-21
Disabled xen kernel build

config/kernel/kernel.config.i586-ipfire

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.23-ipfire
-# Mon May 18 14:11:11 2009
+# Linux kernel version: 2.6.27.31
+# Fri Aug 21 16:30:37 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -274,6 +274,7 @@ CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_MATH_EMULATION=y
@@ -1015,7 +1016,6 @@ CONFIG_SONY_LAPTOP=m
 # CONFIG_SONYPI_COMPAT is not set
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m

doc/packages-list.txt

@@ -36,15 +36,14 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.19
-* alsa-lib-1.0.19-kmod-2.6.27.25-ipfire
+* alsa-lib-1.0.19-kmod-2.6.27.31-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
 * arping-2.05
 * as86-0.16.17
 * asterisk-1.4.18
-* atl2-2.0.5-kmod-2.6.27.25-ipfire
-* atl2-2.0.5-kmod-2.6.27.25-ipfire-xen
+* atl2-2.0.5-kmod-2.6.27.31-ipfire
 * autoconf-2.59
 * automake-1.9.6
 * backup-ipfire
@@ -69,8 +68,7 @@
 * clamav-0.95.2
 * cmake-2.4.8
 * collectd-4.5.3
-* compat-wireless-2009-06-30-kmod-2.6.27.25-ipfire
-* compat-wireless-2009-06-30-kmod-2.6.27.25-ipfire-xen
+* compat-wireless-2009-08-21-kmod-2.6.27.31-ipfire
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-005
@@ -85,8 +83,7 @@
 * diffutils-2.8.1
 * dnsmasq-2.47
 * dosfstools-2.11
-* e1000e-1.0.2.5-kmod-2.6.27.25-ipfire
-* e1000e-1.0.2.5-kmod-2.6.27.25-ipfire-xen
+* e1000e-1.0.2.5-kmod-2.6.27.31-ipfire
 * e2fsprogs-1.39
 * ebtables-v2.0.8-2
 * ed-0.2
@@ -132,8 +129,7 @@
 * hdparm-8.9
 * hostapd-0.6.9
 * hplip-2.7.10
-* hso-1.9-kmod-2.6.27.25-ipfire
-* hso-1.9-kmod-2.6.27.25-ipfire-xen
+* hso-1.9-kmod-2.6.27.31-ipfire
 * htop-0.8.1
 * httpd-2.2.11
 * hwdata
@@ -156,8 +152,7 @@
 * jpegsrc.v6b
 * kbd-1.12
 * klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.27.25-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.27.25-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire
 * kudzu-1.2.64
 * l7-protocols-2009-05-10
 * lame-3.97
@@ -188,8 +183,7 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.27.25-ipfire
-* linux-2.6.27.25-ipfire-xen
+* linux-2.6.27.31-ipfire
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * lm_sensors-3.0.3
@@ -199,11 +193,9 @@
 * lynis-1.2.6
 * lzo-2.02
 * m4-1.4.4
-* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.25-ipfire
-* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.25-ipfire-xen
+* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.31-ipfire
 * mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
-* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.25-ipfire
-* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.25-ipfire-xen
+* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.31-ipfire
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -249,8 +241,7 @@
 * openssh-5.2p1
 * openssl-0.9.8k
 * openswan-2.6.21
-* openswan-2.6.21-kmod-2.6.27.25-ipfire
-* openswan-2.6.21-kmod-2.6.27.25-ipfire-xen
+* openswan-2.6.21-kmod-2.6.27.31-ipfire
 * openvpn-2.0.9
 * p7zip_4.65
 * pam_mysql-0.7RC1
@@ -325,8 +316,7 @@
 * urlgrabber-3.1.0
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-bff77ec33116-kmod-2.6.27.25-ipfire
-* v4l-dvb-bff77ec33116-kmod-2.6.27.25-ipfire-xen
+* v4l-dvb-bff77ec33116-kmod-2.6.27.31-ipfire
 * vdr-1.6.0
 * vdradmin-am-3.6.4
 * vim-7.0

lfs/compat-wireless

@@ -30,7 +30,7 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2009-06-30
+VER        = 2009-08-21
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 68777ce2aa6b28dc3d37fc2b9a3a6d70
+$(DL_FILE)_MD5 = 36193f34a14f1d681bcff7a2db5cf178
 
 install : $(TARGET)
 
@@ -88,11 +88,15 @@ endif
 #	Apply some wlan-card patches
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
 
-#	Build only the modules
-	cd $(DIR_APP) && sed -i -e "s|install: uninstall modules|install: modules|g" Makefile
-	cd $(DIR_APP) && sed -i -e "s|\t@# All the scripts|\nende:|g" Makefile
+#	Enable B43 NPHY / PHY_LP
+	echo "CONFIG_B43_NPHY=y" >> $(DIR_APP)/config.mk
+	echo "CONFIG_B43_PHY_LP=y" >> $(DIR_APP)/config.mk
 
-	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install
+	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
+
+	# The makefile put the modules to a wrong place move back...
+	cp -rf /lib/modules/$(KVER)-$(VERSUFIX)/lib /
+	rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/lib
 
 	# Xen
 ifeq "$(XEN)" "1"
@@ -108,5 +112,6 @@ endif
 	# place of newer kernels and so not overwrite it...
 	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
 
+	-rm -rf $(DIR_APP)
 	@$(POSTBUILD)
 

lfs/linux

@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .25
-VER        = 2.6.27.25
+PATCHLEVEL = .31
+VER        = 2.6.27.31
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,7 +35,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG	   = linux-xen
-PAK_VER    = 4
+PAK_VER    = 5
 DEPS	   = ""
 
 # Normal build or XEN build.
@@ -62,7 +62,7 @@ patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 squashfs3.4.tar.gz			= $(URL_IPFIRE)/squashfs3.4.tar.gz
 reiser4-for-2.6.27.19.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
 
-$(DL_FILE)_MD5				= 5d6dcff157f30d742c9ee28ad4589779
+$(DL_FILE)_MD5				= b066c348e0fbfa700399d62d2fdfbf11
 netfilter-layer7-v2.21.tar.gz_MD5	= 838422e7d9a06b42e682e9064e5210b5
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
 squashfs3.4.tar.gz_MD5			= 2a4d2995ad5aa6840c95a95ffa6b1da6

make.sh

@@ -25,7 +25,7 @@
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
 VERSION="2.5"
-CORE="30"
+CORE="31"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -338,17 +338,17 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake linux			XEN=1
-  ipfiremake atl2			XEN=1
-  ipfiremake hso			XEN=1
-  ipfiremake e1000e			XEN=1
-  ipfiremake kqemu			XEN=1
-  ipfiremake v4l-dvb			XEN=1
-  ipfiremake madwifi			XEN=1
-#  ipfiremake alsa			XEN=1 KMOD=1
-  ipfiremake openswan			XEN=1 KMOD=1
-  ipfiremake mISDN			XEN=1
-  ipfiremake compat-wireless		XEN=1
+#  ipfiremake linux			XEN=1
+#  ipfiremake atl2			XEN=1
+#  ipfiremake hso			XEN=1
+#  ipfiremake e1000e			XEN=1
+#  ipfiremake kqemu			XEN=1
+#  ipfiremake v4l-dvb			XEN=1
+#  ipfiremake madwifi			XEN=1
+##  ipfiremake alsa			XEN=1 KMOD=1
+#  ipfiremake openswan			XEN=1 KMOD=1
+#  ipfiremake mISDN			XEN=1
+#  ipfiremake compat-wireless		XEN=1
   ipfiremake linux
   ipfiremake atl2
   ipfiremake hso
@@ -712,13 +712,13 @@ 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/
-	ipfiremake xen-image ED=$IPFVER
-	rm -rf $LFS/install/packages/linux-xen-*.ipfire
-  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/
+#	ipfiremake xen-image ED=$IPFVER
+#	rm -rf $LFS/install/packages/linux-xen-*.ipfire
+#  fi
+#  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 
   # Cleanup
   stdumount