From 9d66e4011864a3a40a8ccd5aa8fd8870cad1ef2d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 5 Mar 2018 10:11:31 +0000
Subject: [PATCH] main/*-vanilla: check kernel version in prepare

---
 main/dahdi-linux-vanilla/APKBUILD        | 25 +++++++++++++-----------
 main/devicemaster-linux-vanilla/APKBUILD | 25 +++++++++++++-----------
 main/drbd9-vanilla/APKBUILD              | 25 +++++++++++++-----------
 main/spl-vanilla/APKBUILD                | 21 ++++++++++----------
 main/xtables-addons-vanilla/APKBUILD     | 24 ++++++++++++-----------
 main/zfs-vanilla/APKBUILD                | 21 ++++++++++----------
 6 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/main/dahdi-linux-vanilla/APKBUILD b/main/dahdi-linux-vanilla/APKBUILD
index 6c4930685516..d9c89d631db4 100644
--- a/main/dahdi-linux-vanilla/APKBUILD
+++ b/main/dahdi-linux-vanilla/APKBUILD
@@ -14,17 +14,6 @@ _krel=0
 _kpkgver="$_kver-r$_krel"
 _kabi="$_kver-$_krel-$_flavor"
 
-# verify the kernel version before entering chroot
-_kapkbuild=../../main/linux-vanilla/APKBUILD
-if [ -f $_kapkbuild ]; then
-	(	. $_kapkbuild
-		pkgname=$_name-$_flavor
-		[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-		[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
-		return 0
-	)
-fi
-
 pkgname=$_name-$_flavor
 pkgver=$_kver
 pkgrel=$(( $_krel + $_rel ))
@@ -59,6 +48,20 @@ builddir="$srcdir/$_name-$_ver"
 # grsec legacy
 [ "$_flavor" = "hardened" ] && provides="$_name-grsec=$pkgver-r$pkgrel"
 
+prepare() {
+	default_prepare
+	# verify the kernel version
+	local _kapkbuild=../../main/linux-$_flavor/APKBUILD
+	if [ -f $_kapkbuild ]; then
+		(	. $_kapkbuild
+			pkgname=$_name-$_flavor
+			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+			return 0
+		)
+	fi
+}
+
 build() {
 	cd "$srcdir/$_name-$_ver"
 	make KVERS="${_kabi}" DYNFS="yes" MODULES_EXTRA="zaphfc"
diff --git a/main/devicemaster-linux-vanilla/APKBUILD b/main/devicemaster-linux-vanilla/APKBUILD
index fc623393fcb5..14b9273584e0 100644
--- a/main/devicemaster-linux-vanilla/APKBUILD
+++ b/main/devicemaster-linux-vanilla/APKBUILD
@@ -13,17 +13,6 @@ _krel=0
 _kpkgver="$_kver-r$_krel"
 _kabi="$_kver-$_krel-$_flavor"
 
-# verify the kernel version before entering chroot
-_kapkbuild=../../main/linux-vanilla/APKBUILD
-if [ -f $_kapkbuild ]; then
-	(	. $_kapkbuild
-		pkgname=$_name-$_flavor
-		[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-		[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
-		return 0
-	)
-fi
-
 pkgname=$_name-$_flavor
 pkgver=$_kver
 pkgrel=$(( $_krel + $_rel ))
@@ -42,6 +31,20 @@ builddir="$srcdir"/$_name-$_ver
 # grsec legacy
 [ "$_flavor" = "hardened" ] && provides="$_name-grsec=$pkgver-r$pkgrel"
 
+prepare() {
+	default_prepare
+	# verify the kernel version
+	local _kapkbuild=../../main/linux-$_flavor/APKBUILD
+	if [ -f $_kapkbuild ]; then
+		(	. $_kapkbuild
+			pkgname=$_name-$_flavor
+			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+			return 0
+		)
+	fi
+}
+
 build() {
 	cd "$srcdir/$_name-$_ver"
 	make -C /lib/modules/$_kabi/build SUBDIRS="$PWD" modules V=1
diff --git a/main/drbd9-vanilla/APKBUILD b/main/drbd9-vanilla/APKBUILD
index abbc2ca08ed1..a977983163b8 100644
--- a/main/drbd9-vanilla/APKBUILD
+++ b/main/drbd9-vanilla/APKBUILD
@@ -13,17 +13,6 @@ _krel=0
 _kabi="$_kver-$_krel-$_flavor"
 _kpkgver="$_kver-r$_krel"
 
-# verify the kernel version before entering chroot
-_kapkbuild=../../main/linux-vanilla/APKBUILD
-if [ -f $_kapkbuild ]; then
-	(	. $_kapkbuild
-		pkgname=$_name-$_flavor
-		[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-		[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
-		return 0
-	)
-fi
-
 pkgname=$_name-$_flavor
 pkgver=$_kver
 pkgrel=$(( $_krel + $_rel ))
@@ -38,6 +27,20 @@ source="https://links.linbit.com/sources/$_name/${_ver%.*}/$_name-$_ver-$_rel.ta
 
 builddir=$srcdir/$_name-$_ver-$_rel
 
+prepare() {
+	default_prepare
+	# verify the kernel version
+	local _kapkbuild=../../main/linux-$_flavor/APKBUILD
+	if [ -f $_kapkbuild ]; then
+		(	. $_kapkbuild
+			pkgname=$_name-$_flavor
+			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+			return 0
+		)
+	fi
+}
+
 build() {
 	cd "$builddir"
 	unset LDFLAGS
diff --git a/main/spl-vanilla/APKBUILD b/main/spl-vanilla/APKBUILD
index 670eab2b1020..43d5c0dabd97 100644
--- a/main/spl-vanilla/APKBUILD
+++ b/main/spl-vanilla/APKBUILD
@@ -18,17 +18,6 @@ _krel=0
 _kpkgver="$_kver-r$_krel"
 _kabi="$_kver-$_krel-$_flavor"
 
-# verify the kernel version before entering chroot
-_kapkbuild=../../main/linux-vanilla/APKBUILD
-if [ -f $_kapkbuild ]; then
-	(	. $_kapkbuild
-		pkgname=$_name-$_flavor
-		[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-		[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
-		return 0
-	)
-fi
-
 pkgname=$_name-$_flavor
 pkgver=$_kver
 pkgrel=$(( $_krel + $_rel ))
@@ -48,6 +37,16 @@ builddir="$srcdir/$_name-$_ver"
 prepare() {
 	# do not remove as it sources other prepare
 	default_prepare
+	# verify the kernel version
+	local _kapkbuild=../../main/linux-$_flavor/APKBUILD
+	if [ -f $_kapkbuild ]; then
+		(	. $_kapkbuild
+			pkgname=$_name-$_flavor
+			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+			return 0
+		)
+	fi
 	update_config_sub
 	update_config_guess
 }
diff --git a/main/xtables-addons-vanilla/APKBUILD b/main/xtables-addons-vanilla/APKBUILD
index 21dcea9d0af4..2f2ee3e1fc16 100644
--- a/main/xtables-addons-vanilla/APKBUILD
+++ b/main/xtables-addons-vanilla/APKBUILD
@@ -13,17 +13,6 @@ _krel=0
 _kpkgver="$_kver-r$_krel"
 _kabi="$_kver-$_krel-$_flavor"
 
-# verify the kernel version before entering chroot
-_kapkbuild=../../main/linux-vanilla/APKBUILD
-if [ -f $_kapkbuild ]; then
-	(	. $_kapkbuild
-		pkgname=$_name-$_flavor
-		[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-		[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
-		return 0
-	)
-fi
-
 pkgname=$_name-$_flavor
 pkgver=$_kver
 pkgrel=$(( $_krel + $_rel ))
@@ -42,6 +31,19 @@ source="http://downloads.sourceforge.net/$_name/$_name-$_ver.tar.xz"
 builddir="$srcdir/$_name-$_ver"
 options="!check"
 
+prepare() {
+	default_prepare
+	local _kapkbuild=../../main/linux-$_flavor/APKBUILD
+	if [ -f $_kapkbuild ]; then
+		(	. $_kapkbuild
+			pkgname=$_name-$_flavor
+			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+			return 0
+		)
+	fi
+}
+
 build() {
 	cd "$builddir"
 	unset LDFLAGS
diff --git a/main/zfs-vanilla/APKBUILD b/main/zfs-vanilla/APKBUILD
index fafa3e31a387..a32b0e1d8eca 100644
--- a/main/zfs-vanilla/APKBUILD
+++ b/main/zfs-vanilla/APKBUILD
@@ -14,17 +14,6 @@ _krel=0
 _kpkgver="$_kver-r$_krel"
 _kabi="$_kver-$_krel-$_flavor"
 
-# verify the kernel version before entering chroot
-_kapkbuild=../../main/linux-vanilla/APKBUILD
-if [ -f $_kapkbuild ]; then
-	(	. $_kapkbuild
-		pkgname=$_name-$_flavor
-		[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-		[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
-		return 0
-	)
-fi
-
 pkgname=$_name-$_flavor
 pkgver=$_kver
 pkgrel=$(( $_krel + $_rel ))
@@ -45,6 +34,16 @@ builddir="$srcdir/$_name-$_ver"
 
 prepare() {
 	default_prepare
+	# verify the kernel version
+	local _kapkbuild=../../main/linux-$_flavor-/APKBUILD
+	if [ -f $_kapkbuild ]; then
+		(	. $_kapkbuild
+			pkgname=$_name-$_flavor
+			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+			return 0
+		)
+	fi
 	autoreconf -vif
 }
 
-- 
GitLab