testing/*-vanilla: check kernel in prepare

This commit is contained in:
Natanael Copa 2018-03-05 11:22:41 +00:00
parent c93cb784c1
commit 720d662f29
2 changed files with 28 additions and 22 deletions

View File

@ -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 ))
@ -39,6 +28,20 @@ install_if="$_kpkg=$_kpkgver ipt-netflow"
source="ipt-netflow-$_ver.tar.xz::http://turtle.dereferenced.org/~kaniini/ipt-netflow-$_ver.tar.xz"
builddir="$srcdir/$_name-$_ver"
prepare() {
default_prepare
# verify the kernel version
local _kapkbuild=../../main/linux-$_pkgver/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"
./configure --kver=$_kabi --ipt-inc=/usr/include/libiptc

View File

@ -16,17 +16,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 @@ options="!check"
source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$_ver.tar.xz"
builddir="$srcdir"/WireGuard-$_ver
prepare() {
default_prepare
# verify the kernel version
local _kapkbuild=../../main/linux-$_pkgver/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"
# only building module: see wireguard-tools for userspace