Skip to content
Snippets Groups Projects
Commit 162b2e6e authored by Shiz ...'s avatar Shiz ...
Browse files

testing/wireguard: fix install_if rule and bump _mypkgrel

parent f87448ae
No related branches found
No related tags found
No related merge requests found
...@@ -7,8 +7,10 @@ _kver=4.9.28 ...@@ -7,8 +7,10 @@ _kver=4.9.28
_kpkgrel=1 _kpkgrel=1
# when changing _ver we *must* bump _mypkgrel # when changing _ver we *must* bump _mypkgrel
# we must also match up _toolsrel with wireguard-tools
_ver=0.0.20170517 _ver=0.0.20170517
_mypkgrel=0 _mypkgrel=1
_toolsrel=0
_name=wireguard _name=wireguard
# verify the kernel version before entering chroot # verify the kernel version before entering chroot
...@@ -21,6 +23,7 @@ if [ -f $_kapkbuild ]; then ...@@ -21,6 +23,7 @@ if [ -f $_kapkbuild ]; then
fi fi
_kpkgver="$_kver-r$_kpkgrel" _kpkgver="$_kver-r$_kpkgrel"
_toolsver="$_ver-r$_toolsrel"
_abi_release=${_kver}-${_kpkgrel}-${_flavor} _abi_release=${_kver}-${_kpkgrel}-${_flavor}
pkgname=${_name}-${_flavor} pkgname=${_name}-${_flavor}
...@@ -32,7 +35,7 @@ url='https://www.wireguard.io' ...@@ -32,7 +35,7 @@ url='https://www.wireguard.io'
license="GPLv2" license="GPLv2"
depends="linux-${_flavor}=${_kpkgver}" depends="linux-${_flavor}=${_kpkgver}"
makedepends="linux-${_flavor}-dev=$_kpkgver libmnl-dev" makedepends="linux-${_flavor}-dev=$_kpkgver libmnl-dev"
install_if="wireguard-tools linux-grsec-$_kpkgver" install_if="wireguard-tools=$_toolsver linux-hardened=$_kpkgver"
options="!check" options="!check"
source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$_ver.tar.xz" source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$_ver.tar.xz"
provides="${_name}-grsec=${_kver}-r${pkgrel}" provides="${_name}-grsec=${_kver}-r${pkgrel}"
......
...@@ -7,8 +7,10 @@ _kver=4.9.28 ...@@ -7,8 +7,10 @@ _kver=4.9.28
_kpkgrel=1 _kpkgrel=1
# when changing _ver we *must* bump _mypkgrel # when changing _ver we *must* bump _mypkgrel
# we must also match up _toolsrel with wireguard-tools
_ver=0.0.20170517 _ver=0.0.20170517
_mypkgrel=0 _mypkgrel=1
_toolsrel=0
_name=wireguard _name=wireguard
# verify the kernel version before entering chroot # verify the kernel version before entering chroot
...@@ -21,6 +23,7 @@ if [ -f $_kapkbuild ]; then ...@@ -21,6 +23,7 @@ if [ -f $_kapkbuild ]; then
fi fi
_kpkgver="$_kver-r$_kpkgrel" _kpkgver="$_kver-r$_kpkgrel"
_toolsver="$_ver-r$toolsrel"
_abi_release=${_kver} _abi_release=${_kver}
pkgname=${_name}-${_flavor} pkgname=${_name}-${_flavor}
...@@ -32,7 +35,7 @@ url='https://www.wireguard.io' ...@@ -32,7 +35,7 @@ url='https://www.wireguard.io'
license="GPLv2" license="GPLv2"
depends="${_kpkg}=${_kpkgver}" depends="${_kpkg}=${_kpkgver}"
makedepends="linux-vanilla-dev=$_kpkgver libmnl-dev" makedepends="linux-vanilla-dev=$_kpkgver libmnl-dev"
install_if="wireguard-tools linux-vanilla-$_kpkgver" install_if="wireguard-tools=$_toolsver linux-vanilla=$_kpkgver"
options="!check" options="!check"
source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$_ver.tar.xz" source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$_ver.tar.xz"
builddir="$srcdir"/WireGuard-$_ver builddir="$srcdir"/WireGuard-$_ver
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment