diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-19 14:20:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-19 14:20:41 +0000 |
| commit | eba4f554cc53325bb37f0cca97a5dfd024582271 (patch) | |
| tree | b258b07bc27d8543641d19753ac7237a6fc2bd61 /community | |
| parent | 93a228295b795ffdeea3e7c65525c0c191751a48 (diff) | |
| download | aports-eba4f554cc53325bb37f0cca97a5dfd024582271.tar.bz2 aports-eba4f554cc53325bb37f0cca97a5dfd024582271.tar.xz | |
*/*-vanilla: remove linux-vanilla. replaced by linux-lts
Users should use linux-lts. We remove linux-vanilla to reduce
reduce the maintenance burden.
Diffstat (limited to 'community')
| -rw-r--r-- | community/jool-modules-vanilla/APKBUILD | 95 | ||||
| -rw-r--r-- | community/virtualbox-guest-modules-vanilla/APKBUILD | 96 | ||||
| -rw-r--r-- | community/virtualbox-guest-modules-vanilla/const-struct-kernel_param.patch | 76 | ||||
| -rw-r--r-- | community/wireguard-vanilla/APKBUILD | 91 |
4 files changed, 0 insertions, 358 deletions
diff --git a/community/jool-modules-vanilla/APKBUILD b/community/jool-modules-vanilla/APKBUILD deleted file mode 100644 index 728e810dd8..0000000000 --- a/community/jool-modules-vanilla/APKBUILD +++ /dev/null @@ -1,95 +0,0 @@ -# Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Maintainer: Jakub Jirutka <jakub@jirutka.cz> - -# Jool version -# Keep _ver in sync with community/jool-tools! -# When changing _ver we *must* bump _rel! -_name=jool-modules -_ver=4.0.6 -_rel=0 - -# For custom kernels set $FLAVOR. -_flavor="$FLAVOR" -_extra_flavors="" -if [ -z "$FLAVOR" ]; then - _flavor=vanilla - case $CARCH in - x86 | x86_64) _extra_flavors="virt";; - esac -fi - -# Kernel version -# Keep in sync with main/linux-vanilla! -_kpkg=linux-$_flavor -_kver=4.19.90 -_krel=0 -_kpkgver="$_kver-r$_krel" - -pkgname=$_name-$_flavor -pkgver=$_kver -pkgrel=$(( $_krel + $_rel )) -pkgdesc="SIIT and NAT64 for Linux (kernel modules for linux-$_flavor)" -url="https://jool.mx" -arch="all" -license="GPL-2.0-or-later" -depends="$_kpkg=$_kpkgver" -makedepends="$_kpkg-dev=$_kpkgver linux-headers" -install_if="$_kpkg=$_kpkgver jool-tools" -subpackages="" -source="https://github.com/NICMx/Jool/releases/download/v$_ver/jool-$_ver.tar.gz" -builddir="$srcdir/jool-$_ver" -options="!check" # no tests provided - -for _f in $_extra_flavors; do - makedepends="$makedepends linux-$_f-dev=$_kpkgver" - subpackages="$subpackages $_name-$_f:_extra" -done - -prepare() { - default_prepare - - if [ -z "$FLAVOR" ]; then - ( . "$startdir"/../../main/linux-$_flavor/APKBUILD - [ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver" - [ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel" - return 0 - ) - fi - - local flavor; for flavor in $_flavor $_extra_flavors; do - cp -r "$builddir" "$srcdir"/$flavor - done -} - -build() { - unset LDFLAGS - - local flavor; for flavor in $_flavor $_extra_flavors; do - make -C "$srcdir"/"$flavor"/src/mod \ - MODULES_DIR="/lib/modules/$_kver-$_krel-$flavor" - done -} - -package() { - _modules_install "$_flavor" "$pkgdir" -} - -_extra() { - local flavor=${subpkgname##*-} - depends="linux-$flavor=$_kpkgver" - install_if="linux-$flavor=$_kpkgver jool-tools" - pkgdesc="SIIT and NAT64 for Linux (kernel modules for linux-$flavor)" - - _modules_install "$flavor" "$subpkgdir" -} - -_modules_install() { - local flavor="$1" - local destdir="$2" - - make -C "$srcdir"/$flavor/src/mod modules_install \ - MODULES_DIR=/lib/modules/$_kver-$_krel-$flavor \ - INSTALL_MOD_PATH="$destdir" -} - -sha512sums="8648cc876d801b34c4bc9616da642727d1e49ed2937daa7fdca58c0fd80dbd1c432018af410c44c1d24224aba5289f726f43adc259cdf8193832d39a86d0f6a6 jool-4.0.6.tar.gz" diff --git a/community/virtualbox-guest-modules-vanilla/APKBUILD b/community/virtualbox-guest-modules-vanilla/APKBUILD deleted file mode 100644 index cad458a84f..0000000000 --- a/community/virtualbox-guest-modules-vanilla/APKBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# Maintainer: Ben Allen <bensallen@me.com> -# Contributor: Ben Allen <bensallen@me.com> - -# when changing _ver we *must* bump _rel -_name=virtualbox-guest-modules -_ver=6.0.14 -_rel=0 - -_flavor=${FLAVOR:-vanilla} -_kpkg=linux-$_flavor -_kver=4.19.90 -_krel=0 - -_kpkgver="$_kver-r$_krel" -_kabi=$_kver-$_krel-$_flavor -_kabi_virt=$_kver-$_krel-virt - -pkgname=$_name-$_flavor -pkgver=$_kver -pkgrel=$(($_krel + $_rel)) - -pkgdesc="VirtualBox Additions guest kernel modules for $_flavor" -arch='x86_64' # seems to fail on x86: https://github.com/alpinelinux/aports/pull/8215#issuecomment-496630776 -url='https://virtualbox.org/' -license="GPL-2.0 custom" -makedepends="linux-vanilla-dev=$_kpkgver linux-virt-dev=$_kpkgver sed coreutils" -subpackages="$_name-virt:virt" -source="https://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2 - " -install_if="linux-$_flavor=$_kpkgver virtualbox-guest-additions" -builddir="$srcdir"/VirtualBox-$_ver - -prepare() { - local i - - cd "$builddir" - 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 - KERN_VER=$_kabi "$builddir"/src/VBox/Additions/linux/export_modules.sh \ - "$srcdir/vbox-kmod-$_ver.tar.gz" - - for i in $_kabi $_kabi_virt; do - mkdir -p "$srcdir/$i" - tar -C "$srcdir/$i" -zxf "$srcdir"/vbox-kmod-$_ver.tar.gz - done -} - -build() { - local i - for i in $_kabi $_kabi_virt; do - cd "$srcdir/$i" - # Build Kernel Modules - msg "Build for $i" - make KERN_DIR=/lib/modules/${i}/build all - done -} - -check() { - local i - for i in $_kabi $_kabi_virt; do - cd "$srcdir/$i" - make KERN_DIR=/lib/modules/${i}/build check - done -} - -package() { - local i module= - for i in $_kabi $_kabi_virt; do - cd "$srcdir/$i" - for module in *.ko; do - install -v -D -m644 ${module} \ - "$pkgdir/lib/modules/$i/misc/${module}" - done - done -} - -virt() { - pkgdesc="VirtualBox Additions kernel modules for virt" - install_if="linux-virt=$_kpkgver virtualbox-guest-additions" - mkdir -p "$subpkgdir"/lib/modules/ - # vboxvideo.ko won't load with virt kernel as it doesn't have DRM - rm "$pkgdir"/lib/modules/$_kabi_virt/misc/vboxvideo.ko - mv "$pkgdir"/lib/modules/$_kabi_virt \ - "$subpkgdir"/lib/modules/ -} - -sha512sums="e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d VirtualBox-6.0.14.tar.bz2" diff --git a/community/virtualbox-guest-modules-vanilla/const-struct-kernel_param.patch b/community/virtualbox-guest-modules-vanilla/const-struct-kernel_param.patch deleted file mode 100644 index d73ae16133..0000000000 --- a/community/virtualbox-guest-modules-vanilla/const-struct-kernel_param.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -index bd81000..aa9d6b0 100644 ---- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -@@ -958,7 +958,7 @@ EXPORT_SYMBOL(VBoxGuestIDCCall); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) - - /** log and dbg_log parameter setter. */ --static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam) -+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam) - { - if (g_fLoggerCreated) - { -@@ -973,7 +973,7 @@ static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *p - } - - /** log and dbg_log parameter getter. */ --static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam) -+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam) - { - PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); - *pszBuf = '\0'; -@@ -984,7 +984,7 @@ static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam) - - - /** log and dbg_log_flags parameter setter. */ --static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam) -+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam) - { - if (g_fLoggerCreated) - { -@@ -998,7 +998,7 @@ static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param - } - - /** log and dbg_log_flags parameter getter. */ --static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam) -+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam) - { - PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); - *pszBuf = '\0'; -@@ -1009,7 +1009,7 @@ static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam) - - - /** log and dbg_log_dest parameter setter. */ --static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam) -+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam) - { - if (g_fLoggerCreated) - { -@@ -1023,7 +1023,7 @@ static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *p - } - - /** log and dbg_log_dest parameter getter. */ --static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam) -+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam) - { - PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); - *pszBuf = '\0'; -@@ -1034,7 +1034,7 @@ static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam) - - - /** r3_log_to_host parameter setter. */ --static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam) -+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam) - { - if ( pszValue == NULL - || *pszValue == '\0' -@@ -1052,7 +1052,7 @@ static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_par - } - - /** r3_log_to_host parameter getter. */ --static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam) -+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam) - { - strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled"); - return strlen(pszBuf); diff --git a/community/wireguard-vanilla/APKBUILD b/community/wireguard-vanilla/APKBUILD deleted file mode 100644 index 1d4d4e5c8d..0000000000 --- a/community/wireguard-vanilla/APKBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# Contributor: Stuart Cardall <developer@it-offshore.co.uk> -# Maintainer: Stuart Cardall <developer@it-offshore.co.uk> - -# wireguard version -_ver=0.0.20191212 -_rel=0 - -# kernel version -_kver=4.19.90 -_krel=0 - -_kpkgver="$_kver-r$_krel" - -# for custom kernels set $FLAVOR -_extra_flavors= -if [ -z "$FLAVOR" ]; then - _flavor=vanilla - case $CARCH in - x86|x86_64) _extra_flavors="virt";; - esac -else - _flavor=$FLAVOR -fi -_kpkg=linux-$_flavor - -pkgname=wireguard-$_flavor -pkgver=$_kver -pkgrel=$(( $_rel + $_krel)) - -pkgdesc="Next generation secure network tunnel: kernel modules for $_flavor" -arch="all" -url="https://www.wireguard.com" -license="GPL-2.0" -depends="linux-$_flavor=$_kpkgver" -makedepends=" - libmnl-dev - linux-$_flavor-dev=$_kpkgver - linux-firmware-none - " -install_if="wireguard-tools-wg=$_ver-r$_rel linux-$_flavor=$_kpkgver" -options="!check" -source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$_ver.tar.xz" -builddir="$srcdir"/WireGuard-$_ver - -for f in $_extra_flavors; do - makedepends="$makedepends linux-$f-dev=$_kpkgver" - subpackages="$subpackages wireguard-$f:_extra" -done - -prepare() { - default_prepare - if [ -z "$FLAVOR" ]; then - ( . "$startdir"/../../main/linux-$_flavor/APKBUILD - [ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver" - [ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel" - return 0 - ) - fi - local flavor= - for flavor in $_flavor $_extra_flavors; do - cp -r "$builddir" "$srcdir"/$flavor - done -} - -build() { - unset LDFLAGS - local flavor= kabi= - for flavor in $_flavor $_extra_flavors; do - kabi="$_kver-$_krel-$flavor" - make -C "$srcdir/$flavor"/src \ - KERNELDIR=/lib/modules/$kabi/build module - done -} - -package() { - local kabi="$_kver-$_krel-$_flavor" - install -Dm644 "$srcdir"/$_flavor/src/wireguard.ko \ - "$pkgdir/lib/modules/$kabi/extra/wireguard.ko" -} - -_extra() { - flavor=${subpkgname##*-} - depends="linux-$flavor=$_kpkgver" - install_if="wireguard-tools-wg=$_ver-r$_rel linux-$flavor=$_kpkgver" - pkgdesc="Next generation secure network tunnel: kernel modules for $flavor" - local kabi="$_kver-$_krel-$flavor" - install -Dm644 "$srcdir"/virt/src/wireguard.ko \ - "$subpkgdir/lib/modules/$kabi/extra/wireguard.ko" -} - -sha512sums="3e6b3841c72f0b30dab6e61ba07a865c5601617047f90a228cefc4ed6eb0511b9c76d745df9a89dfc71791937e1268bbc0b1cfa6f7291b77a4db0f2fb14d272a WireGuard-0.0.20191212.tar.xz" |
