testing/aws-ena-driver-*: fix driver for vanilla

remove -hardened

testing/aws-ena-driver-hardened/APKBUILD

@@ -1,47 +0,0 @@
-# Maintainer: Mike Crute <mike@crute.us>
-
-_flavor="${FLAVOR:-hardened}"
-_pkgver=1.5.0
-_pkgrel=2
-
-# This APK is co-versioned with the kernel instead of using the upstream
-# version, so pull in the kernel pkg version as _kernver and kernel pkg rel as
-# _kernrel
-if  [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
-	eval $(sed -n \
-	    -e '/^pkgver/s/^pkg/_kern/p' \
-	    -e '/^pkgrel/s/^pkg/_kern/p' \
-	    ../../main/linux-${_flavor}/APKBUILD)
-fi
-
-_kern_abi="${_kernver}-${_kernrel}-${_flavor}"
-
-pkgname="aws-ena-driver-${_flavor}"
-pkgver="${_kernver}"
-pkgrel="$(( ${_kernrel} + ${_pkgrel} ))"
-pkgdesc="Linux Kernel driver for Elastic Network Adapter (ENA) family"
-url="https://github.com/amzn/amzn-drivers"
-arch="x86 x86_64"
-license="GPL-2.0"
-# Upstream has no tests
-options="!strip !check"
-depends=
-makedepends="linux-${_flavor}-dev=${_kernver}-r${_kernrel}"
-install=
-source="https://github.com/amzn/amzn-drivers/archive/ena_linux_${_pkgver}.tar.gz ena.conf"
-builddir="$srcdir/amzn-drivers-ena_linux_${_pkgver}"
-
-build() {
-	cd "$builddir/kernel/linux/ena"
-	make BUILD_KERNEL="$_kern_abi"
-}
-
-package() {
-	cd "$builddir/kernel/linux/ena"
-	install -Dm644 "$srcdir"/ena.conf "$pkgdir"/etc/modules-load.d/ena.conf
-	install -Dm644 ena.ko \
-		"$pkgdir/lib/modules/${_kern_abi}/kernel/drivers/net/ethernet/amazon/ena/ena.ko"
-}
-
-sha512sums="32c3aee0aa806ffd1c6f78e3ce95c73699fd5fb0871a749d4ba54aba03390793ef92b4f76017d660bdf0907c91337d82b9570fffa93232f42becc240970310fa  ena_linux_1.5.0.tar.gz
-479a96de0284c815cb4bc60ee129be831f97424f121ede3c14c3dfead162ebb5a3f16c535cc412caf0bdcf2de70c6c3f6cc1c83ff2d4aae1f5e3848279f927d2  ena.conf"

testing/aws-ena-driver-hardened/ena.conf

@@ -1 +0,0 @@
-ena

testing/aws-ena-driver-vanilla/APKBUILD

@@ -1,6 +1,47 @@
 # Maintainer: Mike Crute <mike@crute.us>
-FLAVOR="vanilla"
 
-if [ -f ../aws-ena-driver-hardened/APKBUILD ]; then
+_flavor="${FLAVOR:-hardened}"
-	source ../aws-ena-driver-hardened/APKBUILD
+_pkgver=1.5.0
+_pkgrel=2
+
+# This APK is co-versioned with the kernel instead of using the upstream
+# version, so pull in the kernel pkg version as _kernver and kernel pkg rel as
+# _kernrel
+if  [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
+	eval $(sed -n \
+	    -e '/^pkgver/s/^pkg/_kern/p' \
+	    -e '/^pkgrel/s/^pkg/_kern/p' \
+	    ../../main/linux-${_flavor}/APKBUILD)
 fi
+
+_kern_abi="${_kernver}-${_kernrel}-${_flavor}"
+
+pkgname="aws-ena-driver-${_flavor}"
+pkgver="${_kernver}"
+pkgrel="$(( ${_kernrel} + ${_pkgrel} ))"
+pkgdesc="Linux Kernel driver for Elastic Network Adapter (ENA) family"
+url="https://github.com/amzn/amzn-drivers"
+arch="x86 x86_64"
+license="GPL-2.0"
+# Upstream has no tests
+options="!strip !check"
+depends=
+makedepends="linux-${_flavor}-dev=${_kernver}-r${_kernrel}"
+install=
+source="https://github.com/amzn/amzn-drivers/archive/ena_linux_${_pkgver}.tar.gz ena.conf"
+builddir="$srcdir/amzn-drivers-ena_linux_${_pkgver}"
+
+build() {
+	cd "$builddir/kernel/linux/ena"
+	make BUILD_KERNEL="$_kern_abi"
+}
+
+package() {
+	cd "$builddir/kernel/linux/ena"
+	install -Dm644 "$srcdir"/ena.conf "$pkgdir"/etc/modules-load.d/ena.conf
+	install -Dm644 ena.ko \
+		"$pkgdir/lib/modules/${_kern_abi}/kernel/drivers/net/ethernet/amazon/ena/ena.ko"
+}
+
+sha512sums="32c3aee0aa806ffd1c6f78e3ce95c73699fd5fb0871a749d4ba54aba03390793ef92b4f76017d660bdf0907c91337d82b9570fffa93232f42becc240970310fa  ena_linux_1.5.0.tar.gz
+479a96de0284c815cb4bc60ee129be831f97424f121ede3c14c3dfead162ebb5a3f16c535cc412caf0bdcf2de70c6c3f6cc1c83ff2d4aae1f5e3848279f927d2  ena.conf"