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: main/*-vanilla: check kernel version in prepare

---
 main/devicemaster-linux-vanilla/APKBUILD | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'main/devicemaster-linux-vanilla/APKBUILD')

diff --git a/main/devicemaster-linux-vanilla/APKBUILD b/main/devicemaster-linux-vanilla/APKBUILD
index fc623393fc..14b9273584 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
-- 
cgit v1.2.3