diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-05 10:11:31 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-05 11:23:32 +0000 |
| commit | 9d66e4011864a3a40a8ccd5aa8fd8870cad1ef2d (patch) | |
| tree | 627135cb7673aab3c01d335a765822212cf48e30 /main/spl-vanilla | |
| parent | 7a01b7f1e63a066dceec480a976291d27f5ce1c8 (diff) | |
| download | aports-9d66e4011864a3a40a8ccd5aa8fd8870cad1ef2d.tar.bz2 aports-9d66e4011864a3a40a8ccd5aa8fd8870cad1ef2d.tar.xz | |
main/*-vanilla: check kernel version in prepare
Diffstat (limited to 'main/spl-vanilla')
| -rw-r--r-- | main/spl-vanilla/APKBUILD | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/main/spl-vanilla/APKBUILD b/main/spl-vanilla/APKBUILD index 670eab2b10..43d5c0dabd 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 } |