aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/dahdi-linux-vanilla/APKBUILD25
-rw-r--r--main/devicemaster-linux-vanilla/APKBUILD25
-rw-r--r--main/drbd9-vanilla/APKBUILD25
-rw-r--r--main/spl-vanilla/APKBUILD21
-rw-r--r--main/xtables-addons-vanilla/APKBUILD24
-rw-r--r--main/zfs-vanilla/APKBUILD21
6 files changed, 75 insertions, 66 deletions
diff --git a/main/dahdi-linux-vanilla/APKBUILD b/main/dahdi-linux-vanilla/APKBUILD
index 6c49306855..d9c89d631d 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 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
diff --git a/main/drbd9-vanilla/APKBUILD b/main/drbd9-vanilla/APKBUILD
index abbc2ca08e..a977983163 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 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
}
diff --git a/main/xtables-addons-vanilla/APKBUILD b/main/xtables-addons-vanilla/APKBUILD
index 21dcea9d0a..2f2ee3e1fc 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 fafa3e31a3..a32b0e1d8e 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
}