testing/linux-vserver: upgrade to 2.6.30.7

also:
- depend on linux-firmware
- disable IDE stuff, like grsec kernel
- move kernel.release to /usr/share/kernel/vserver

2 files changed, 15 insertions, 100 deletions

diff --git a/testing/linux-vserver/APKBUILD b/testing/linux-vserver/APKBUILD
index 4901257f..00f574a2 100644
--- a/testing/linux-vserver/APKBUILD
+++ b/testing/linux-vserver/APKBUILD
@@ -2,12 +2,12 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=2.6.30.6
+pkgver=2.6.30.7
 _kernver=2.6.30
 pkgrel=0
 pkgdesc="Linux kernel with vserver"
 url="http://linux-vserver.org/"
-depends="mkinitfs"
+depends="mkinitfs linux-firmware"
 makedepends="perl installkernel"
 _config=${config:-kernelconfig}
 install="$pkgname.post-install $pkgname.post-upgrade"
@@ -28,6 +28,9 @@ _prepare() {
 		bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1
 	fi
 
+	sed -i -e 's/EXTRAVERSION = \.6/EXTRAVERSION = .7/' \
+		../patch-2.6.30.6-vs2.3.0.36.14-pre8.diff || return 1
+
 	for i in ../*.diff ../*.patch; do
 		[ -f $i ] || continue
 		msg "Applying $i..."
@@ -58,12 +61,10 @@ build() {
 		INSTALL_MOD_PATH="$pkgdir" \
 		INSTALL_PATH="$pkgdir"/boot
 
-	ln -s vmlinuz-${_abi_release} "${pkgdir}"/boot/$_flavor
-
 	rm -f "$pkgdir"/lib/modules/${_abi_release}/build \
 		"$pkgdir"/lib/modules/${_abi_release}/source
 	install -D include/config/kernel.release \
-		"$pkgdir"/usr/share/$pkgname/kernel.release
+		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
 }
 
 dev() {
@@ -113,7 +114,7 @@ dev() {
 }
 
 md5sums="7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-f89295707f68c2b349534b490c9d5f2d  patch-2.6.30.6.bz2
+7c91fa862b90d74da3aa83446d69a412  patch-2.6.30.7.bz2
 37e45dcf0eb69e8cc8665522dde28f1a  patch-2.6.30.6-vs2.3.0.36.14-pre8.diff
 ca05fd252783b82e01610e775cf56498  net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
-d6c121ed9e568fe4179afc428ff824b6  kernelconfig"
+c0c7c1b1364f7140a1277c110d0bbb83  kernelconfig"
diff --git a/testing/linux-vserver/kernelconfig b/testing/linux-vserver/kernelconfig
index c0cca735..2a350125 100644
--- a/testing/linux-vserver/kernelconfig
+++ b/testing/linux-vserver/kernelconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30.5-vs2.3.0.36.14-pre7
-# Tue Sep  8 11:31:06 2009
+# Linux kernel version: 2.6.30.7-vs2.3.0.36.14-pre8
+# Tue Sep 22 11:34:29 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -198,12 +198,12 @@ CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_VMI=y
-CONFIG_KVM_CLOCK=y
+# CONFIG_KVM_CLOCK is not set
 CONFIG_KVM_GUEST=y
 CONFIG_LGUEST_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_PARAVIRT_CLOCK is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -335,7 +335,7 @@ CONFIG_PHYSICAL_START=0x100000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_HOTPLUG_CPU=y
-CONFIG_COMPAT_VDSO=y
+# CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -1056,7 +1056,7 @@ CONFIG_NET_9P_RDMA=m
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -1274,89 +1274,7 @@ CONFIG_EEPROM_AT25=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-# CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS is not set
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
@@ -1416,7 +1334,6 @@ CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_AIC7XXX=m
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
 CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
 CONFIG_AIC7XXX_DEBUG_ENABLE=y
 CONFIG_AIC7XXX_DEBUG_MASK=0
 CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
@@ -1424,7 +1341,6 @@ CONFIG_SCSI_AIC7XXX_OLD=m
 CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
 CONFIG_AIC79XX_DEBUG_ENABLE=y
 CONFIG_AIC79XX_DEBUG_MASK=0
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
@@ -2007,7 +1923,6 @@ CONFIG_HDLC_PPP=m
 CONFIG_HDLC_X25=m
 CONFIG_PCI200SYN=m
 CONFIG_WANXL=m
-# CONFIG_WANXL_BUILD_FIRMWARE is not set
 CONFIG_PC300TOO=m
 CONFIG_N2=m
 CONFIG_C101=m
@@ -3766,7 +3681,6 @@ CONFIG_LEDS_BD2802=m
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m