main/linux-scst: update scst to 2.1.0 and kernel to 2.6.39.4

1 files changed, 33 insertions, 44 deletions

diff --git a/main/linux-scst/APKBUILD b/main/linux-scst/APKBUILD
index 6caf4f285e..5b61125c5e 100644
--- a/main/linux-scst/APKBUILD
+++ b/main/linux-scst/APKBUILD
@@ -2,31 +2,36 @@
 
 _flavor=scst
 pkgname=linux-${_flavor}
-pkgver=2.6.36.3
-_kernver=2.6.36
+pkgver=2.6.39.4
+
+_scstver=2.1.0
+
+if [ "${pkgver##*.*.*.*}" = "$pkgver" ]; then
+	_kernver=$pkgver
+else
+	_kernver=${pkgver%.*}
+fi
+
 pkgrel=0
-pkgdesc="Linux kernel optimised for scst"
+pkgdesc="Linux kernel with SCST"
 url="http://scst.sourceforge.net"
 depends="mkinitfs linux-firmware"
-makedepends="perl installkernel bash"
+makedepends="perl installkernel"
 options="!strip"
 _config=${config:-kernelconfig.${CARCH}}
 install=
-source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
-	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
+source="http://download.xs4all.nl/ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
+	http://download.xs4all.nl/ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
 	kernelconfig.x86_64
-	scst-2.0.0.1-2.6.36.patch
-	unionfs-2.5.7_for_$_kernver.diff
-	0004-arp-flush-arp-cache-on-device-change.patch
+	scst-2.1.0-2.6.39.patch
 	"
-subpackages="$pkgname-dev linux-firmware:firmware"
+subpackages="$pkgname-dev"
 arch="x86_64"
 license="GPL-2"
 
-_abi_release=${pkgver}-${_flavor}
+_abi_release=${pkgver}-${_scstver}
 
 prepare() {
-	local _patch_failed=
 	cd "$srcdir"/linux-$_kernver
 	if [ "$_kernver" != "$pkgver" ]; then
 		bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1
@@ -34,25 +39,15 @@ prepare() {
 
 	# first apply patches in specified order
 	for i in $source; do
+		i=${i##*/}
 		case $i in
-		*.patch)
+		*.patch|*.diff)
 			msg "Applying $i..."
-			if ! patch -s -p1 -N -i "$srcdir"/$i; then
-				echo $i >>failed
-				_patch_failed=1
-			fi
+			patch -s -p1 -i "$srcdir"/$i || return 1
 			;;
 		esac
 	done
 
-	if ! [ -z "$_patch_failed" ]; then
-		error "The following patches failed:"
-		cat failed
-		return 1
-	fi
-
-	echo "-scst" > "$srcdir"/linux-$_kernver/localversion-scst
-	
 	mkdir -p "$srcdir"/build
 	cp "$srcdir"/$_config "$srcdir"/build/.config || return 1
 	make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \
@@ -61,13 +56,14 @@ prepare() {
 
 # this is so we can do: 'abuild menuconfig' to reconfigure kernel
 menuconfig() {
-	cd "$srcdir"/build || return 1
+	cd "$srcdir"/build
 	make menuconfig
-	cp .config "$startdir"/$_config
+	cp .config "$startdir"/$_config || return 1
 }
 
 build() {
 	cd "$srcdir"/build
+	export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
 	make CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \
 		|| return 1
@@ -76,13 +72,15 @@ build() {
 package() {
 	cd "$srcdir"/build
 	mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules
-	make -j1 modules_install firmware_install install \
+	make -j1 modules_install install \
 		INSTALL_MOD_PATH="$pkgdir" \
 		INSTALL_PATH="$pkgdir"/boot \
 		|| return 1
 
-	rm -f "$pkgdir"/lib/modules/${_abi_release}/build \
-		"$pkgdir"/lib/modules/${_abi_release}/source
+	rm -rf "$pkgdir"/lib/modules/*/build \
+		"$pkgdir"/lib/modules/*/source
+	rm -rf "$pkgdir"/lib/firmware
+
 	install -D include/config/kernel.release \
 		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
 }
@@ -95,7 +93,7 @@ dev() {
 	# this way you dont need to install the 300-400 kernel sources to
 	# build a tiny kernel module
 	#
-	pkgdesc="Headers and script for third party modules for grsec kernel"
+	pkgdesc="Headers and script for third party modules for kernel"
 	local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
 
 	# first we import config, run prepare to set up for building
@@ -133,16 +131,7 @@ dev() {
 		"$subpkgdir"/lib/modules/${_abi_release}/build
 }
 
-firmware() {
-	pkgdesc="Firmware for linux kernel"
-	replaces="linux-grsec linux-vserver"
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/firmware "$subpkgdir"/lib/
-}
-
-md5sums="61f3739a73afb6914cb007f37fb09b62  linux-2.6.36.tar.bz2
-33f51375d4baa343502b39acf94d5a6c  patch-2.6.36.3.bz2
-68d4cbd30411aca485293117bd98ec38  kernelconfig.x86_64
-e62cd51e9452633821e4457564a094f3  scst-2.0.0.1-2.6.36.patch
-fec281a4e03fed560ce309ad8fc5a592  unionfs-2.5.7_for_2.6.36.diff
-776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch"
+md5sums="1aab7a741abe08d42e8eccf20de61e05  linux-2.6.39.tar.bz2
+ff5eb7323c054a128d2922bde3297ed5  patch-2.6.39.4.bz2
+4fea1df4f5f8358c521d88b94af6c704  kernelconfig.x86_64
+456cd9f0a71d9b2ca15d207f2d2a59a1  scst-2.1.0-2.6.39.patch"