From ef19508f801aaadcb02dba720254cbbcd4a0a50c Mon Sep 17 00:00:00 2001
From: 2cgc5h <2cgc5h@via.tokyo.jp>
Date: Sat, 12 Mar 2022 14:05:51 +0000
Subject: [PATCH] Cleanup: use $startdir when referencing relative path aports
APKBUILD files
---
community/java-gcj-compat/APKBUILD | 4 ++--
main/dahdi-linux-lts/APKBUILD | 2 +-
main/xtables-addons-lts/APKBUILD | 2 +-
main/zfs-lts/APKBUILD | 2 +-
main/zfs-rpi/APKBUILD | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/community/java-gcj-compat/APKBUILD b/community/java-gcj-compat/APKBUILD
index 3f589d4b98d1..60127f415727 100644
--- a/community/java-gcj-compat/APKBUILD
+++ b/community/java-gcj-compat/APKBUILD
@@ -18,8 +18,8 @@ makedepends="gcc6-java=$_gccver-r$_gccpkgrel zlib-dev"
prepare() {
(
- gccver=$(. ../../community/gcc6/APKBUILD ; echo "$pkgver")
- gccpkgrel=$(. ../../community/gcc6/APKBUILD ; echo "$pkgrel")
+ gccver=$(. "$startdir"/../../community/gcc6/APKBUILD ; echo "$pkgver")
+ gccpkgrel=$(. "$startdir"/../../community/gcc6/APKBUILD ; echo "$pkgrel")
if [ "$gccver" != "$_gccver" ] || [ "$gccpkgrel" != "$_gccpkgrel" ]; then
die "gcc6 version ($gccver) needs to match _gccver ($_gccver)"
fi
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index e670d2f2d083..44fba19e844c 100644
--- a/main/dahdi-linux-lts/APKBUILD
+++ b/main/dahdi-linux-lts/APKBUILD
@@ -41,7 +41,7 @@ builddir="$srcdir/$_name-$_ver"
prepare() {
default_prepare
# verify the kernel version
- local _kapkbuild=../../main/linux-$_flavor/APKBUILD
+ local _kapkbuild="$startdir"/../../main/linux-$_flavor/APKBUILD
if [ -f $_kapkbuild ]; then
( . $_kapkbuild
pkgname=$_name-$_flavor
diff --git a/main/xtables-addons-lts/APKBUILD b/main/xtables-addons-lts/APKBUILD
index 9102b395fd91..bb2a7f153740 100644
--- a/main/xtables-addons-lts/APKBUILD
+++ b/main/xtables-addons-lts/APKBUILD
@@ -30,7 +30,7 @@ options="!check"
prepare() {
default_prepare
- local _kapkbuild=../../main/linux-$_flavor/APKBUILD
+ local _kapkbuild="$startdir"/../../main/linux-$_flavor/APKBUILD
if [ -f $_kapkbuild ]; then
( . $_kapkbuild
pkgname=$_name-$_flavor
diff --git a/main/zfs-lts/APKBUILD b/main/zfs-lts/APKBUILD
index 4e00afae1242..bcb892c1fa18 100644
--- a/main/zfs-lts/APKBUILD
+++ b/main/zfs-lts/APKBUILD
@@ -51,7 +51,7 @@ done
prepare() {
default_prepare
# verify the kernel version
- local _kapkbuild=../../main/linux-$_flavor-/APKBUILD
+ local _kapkbuild="$startdir"/../../main/linux-$_flavor-/APKBUILD
if [ -f $_kapkbuild ]; then
( . $_kapkbuild
pkgname=$_name-$_flavor
diff --git a/main/zfs-rpi/APKBUILD b/main/zfs-rpi/APKBUILD
index 6efaa5ea9b7d..6a988cc53227 100644
--- a/main/zfs-rpi/APKBUILD
+++ b/main/zfs-rpi/APKBUILD
@@ -49,7 +49,7 @@ done
prepare() {
default_prepare
# verify the kernel version
- local _kapkbuild=../../main/linux-$_flavor-/APKBUILD
+ local _kapkbuild="$startdir"/../../main/linux-$_flavor-/APKBUILD
if [ -f $_kapkbuild ]; then
( . $_kapkbuild
pkgname=$_name-$_flavor
--
GitLab