main/linux-rpi: upgrade to 3.14.25, 'rpi' flavor

properly use 'rpi' flavor, and update APKBUILD to mostly
match grsec kernel APKBUILD.

1 files changed, 19 insertions, 22 deletions

diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index b795d55d6d..9e1b8e647d 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -2,38 +2,35 @@
 
 _flavor=rpi
 pkgname=linux-${_flavor}
-pkgver=3.14.24
+pkgver=3.14.25
 case $pkgver in
-	*.*.*)	_kernver=${pkgver%.*};;
-	*.*) _kernver=$pkgver;;
+*.*.*)	_kernver=${pkgver%.*};;
+*.*)	_kernver=${pkgver};;
 esac
 pkgrel=1
 pkgdesc="Linux kernel with Raspberry Pi patches"
 url=https://github.com/raspberrypi/linux
 depends="mkinitfs linux-firmware"
-makedepends="perl installkernel bash ncurses-dev gmp-dev bc"
+makedepends="perl installkernel bash gmp-dev bc"
 options="!strip"
 _config=${config:-kernelconfig.${CARCH}}
 install=
 source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
+	http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
 	http://dev.alpinelinux.org/~tteras/linux-3.14.y-rpi-20140923.patch
 	aslr-pie.patch
 	kernelconfig.armhf
 	"
-if [ "${pkgver%.0}" = "$pkgver" ]; then
-	source="$source
-	http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz"
-fi
 subpackages="$pkgname-dev"
 arch="armhf"
 license="GPL-2"
 
-_abi_release=${pkgver}
+_abi_release=${pkgver}-${pkgrel}-${_flavor}
 
 prepare() {
 	local _patch_failed=
 	cd "$srcdir"/linux-$_kernver
-	if [ "$_kernver" != "$pkgver" ]; then
+	if [ "${pkgver%.0}" = "$pkgver" ]; then
 		msg "Applying patch-$pkgver.xz"
 		unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N || return 1
 	fi
@@ -57,6 +54,9 @@ prepare() {
 		return 1
 	fi
 
+	rm -f localversion*
+	echo "-$pkgrel-$_flavor" > localversion-alpine
+
 	mkdir -p "$srcdir"/build
 	cp "$srcdir"/$_config "$srcdir"/build/.config || return 1
 	make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \
@@ -71,8 +71,6 @@ menuconfig() {
 }
 
 build() {
-	unset CPPFLAGS CFLAGS CXXFLAGS
-
 	cd "$srcdir"/build
 	export GCC_SPECS=hardenednopie.specs
 	make CC="${CC:-gcc}" \
@@ -81,9 +79,8 @@ build() {
 }
 
 package() {
-	unset CPPFLAGS CFLAGS CXXFLAGS
-
 	cd "$srcdir"/build
+
 	mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules
 	make -j1 modules_install firmware_install zinstall \
 		INSTALL_MOD_PATH="$pkgdir" \
@@ -107,7 +104,7 @@ dev() {
 	# build a tiny kernel module
 	#
 	pkgdesc="Headers and script for third party modules for grsec kernel"
-	depends="gmp-dev"
+	depends="gmp-dev bash"
 	local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
 
 	# first we import config, run prepare to set up for building
@@ -115,7 +112,7 @@ dev() {
 	mkdir -p "$dir"
 	cp "$srcdir"/$_config "$dir"/.config
 	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \
-		silentoldconfig prepare modules_prepare scripts 
+		silentoldconfig prepare modules_prepare scripts
 
 	# remove the stuff that poits to real sources. we want 3rd party
 	# modules to believe this is the soruces
@@ -146,17 +143,17 @@ dev() {
 }
 
 md5sums="b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
+fffe78a513fa84a15c15a243cac35ca3  patch-3.14.25.xz
 e0ba3d497c3476973e9702af8974145a  linux-3.14.y-rpi-20140923.patch
 f901100a661ec62aac12000872d0276c  aslr-pie.patch
-f4a7b1481ae53c5da4d071be1c880cea  kernelconfig.armhf
-651a92fc1d45c02fa02358bb07e80697  patch-3.14.24.xz"
+f4a7b1481ae53c5da4d071be1c880cea  kernelconfig.armhf"
 sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa  linux-3.14.tar.xz
+c1a13dbaaabc0fe1330c7e0f0f6e10fbf7d384ccf7f1d15061fec4602233b142  patch-3.14.25.xz
 20af8de40d5d59f0ba8e4c0ecd69070854e3fc2c42dce52aa4b9897d2f79b86d  linux-3.14.y-rpi-20140923.patch
 07e9b089c0d5d57e91256ff6e8fe373519c8bd4ae4cba4eb4a2edad3e2cc9a8e  aslr-pie.patch
-28ead5cbc2475e5ba76c841fdc24ad5258665ff1e5a98dfee8e147c6b7303659  kernelconfig.armhf
-80013321b6891216fcff6d0746cb977bd7e8438b02ca13ff261659f3dfa76d51  patch-3.14.24.xz"
+28ead5cbc2475e5ba76c841fdc24ad5258665ff1e5a98dfee8e147c6b7303659  kernelconfig.armhf"
 sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e  linux-3.14.tar.xz
+0ba7ac8b4bc56115d2d88258573f334cb6d1dd7d302f24ae12c1ed693fc3a568801ffa75719ac7622dedf6673e6db6827bf31066b8afde97bc36d8c897e8cfa8  patch-3.14.25.xz
 effa64ce5592f62d3cff5b13936fb8997ae320dd7bb975919d72db725a744f9c760197e405883be09b3aa2251ef10b67e5869294692cf8518a6aa3393fb42634  linux-3.14.y-rpi-20140923.patch
 35055eea7fce660a200cf6f56490a88f1601b4ea95d2364191ad0d890633e8811f2753b5816dad9640384a764b147a4a80b95f39e3bd7a66a15fd5b3ec0c794a  aslr-pie.patch
-847b0daeba852e3d280ad4deb51b95cef375f04ab1033a1bc9a95febba7bf3a893f8752cf7b9286d37030ee8bf0baf3852343a428739934024a9b48505e2c4a0  kernelconfig.armhf
-7f45dfd7340a41c360c7521b573adbb8569825aa078f7ef067a27f19be5c749e42965badde7cdf9c413374953e776e4cce43cd1856f9e08870793a50ba6ad0fb  patch-3.14.24.xz"
+847b0daeba852e3d280ad4deb51b95cef375f04ab1033a1bc9a95febba7bf3a893f8752cf7b9286d37030ee8bf0baf3852343a428739934024a9b48505e2c4a0  kernelconfig.armhf"