From 81a3c7ddb2c20e3f78aee38fde48f66381edb0b9 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 10 Jan 2018 17:06:28 +0000
Subject: [PATCH] testing/aws-ena-driver-*: dont abort if APKBUILD is in wrong
cwd
---
testing/aws-ena-driver-hardened/APKBUILD | 10 ++++++----
testing/aws-ena-driver-vanilla/APKBUILD | 4 +++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/testing/aws-ena-driver-hardened/APKBUILD b/testing/aws-ena-driver-hardened/APKBUILD
index f20eaa69ed90..904d0222fd61 100644
--- a/testing/aws-ena-driver-hardened/APKBUILD
+++ b/testing/aws-ena-driver-hardened/APKBUILD
@@ -7,10 +7,12 @@ _pkgrel=0
# 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
-eval $(sed -n \
- -e '/^pkgver/s/^pkg/_kern/p' \
- -e '/^pkgrel/s/^pkg/_kern/p' \
- ../../main/linux-${_flavor}/APKBUILD)
+if [ -f ../../linux-${_flavor}/APKBUILD ]; then
+ eval $(sed -n \
+ -e '/^pkgver/s/^pkg/_kern/p' \
+ -e '/^pkgrel/s/^pkg/_kern/p' \
+ ../../main/linux-${_flavor}/APKBUILD)
+fi
# Vanilla kernels don't contain a flavor or pkgrel in the ABI
if [ "${_flavor}" = "vanilla" ]; then
diff --git a/testing/aws-ena-driver-vanilla/APKBUILD b/testing/aws-ena-driver-vanilla/APKBUILD
index b3572051d746..72798953a4a8 100644
--- a/testing/aws-ena-driver-vanilla/APKBUILD
+++ b/testing/aws-ena-driver-vanilla/APKBUILD
@@ -2,4 +2,6 @@
FLAVOR="vanilla"
-source ../aws-ena-driver-hardened/APKBUILD
+if [ -f ../aws-ena-driver-hardened/APKBUILD ]; then
+ source ../aws-ena-driver-hardened/APKBUILD
+fi
--
GitLab