Skip to content
Snippets Groups Projects
Commit ef19508f authored by 2cgc5h's avatar 2cgc5h Committed by alice
Browse files

Cleanup: use $startdir when referencing relative path aports APKBUILD files

parent d6b3a8ac
No related branches found
No related tags found
2 merge requests!39304[3.16] main/expat: security upgrade to 2.4.9,!31937Cleanup: use $startdir when referencing relative path aports APKBUILD files
Pipeline #123399 passed
...@@ -18,8 +18,8 @@ makedepends="gcc6-java=$_gccver-r$_gccpkgrel zlib-dev" ...@@ -18,8 +18,8 @@ makedepends="gcc6-java=$_gccver-r$_gccpkgrel zlib-dev"
prepare() { prepare() {
( (
gccver=$(. ../../community/gcc6/APKBUILD ; echo "$pkgver") gccver=$(. "$startdir"/../../community/gcc6/APKBUILD ; echo "$pkgver")
gccpkgrel=$(. ../../community/gcc6/APKBUILD ; echo "$pkgrel") gccpkgrel=$(. "$startdir"/../../community/gcc6/APKBUILD ; echo "$pkgrel")
if [ "$gccver" != "$_gccver" ] || [ "$gccpkgrel" != "$_gccpkgrel" ]; then if [ "$gccver" != "$_gccver" ] || [ "$gccpkgrel" != "$_gccpkgrel" ]; then
die "gcc6 version ($gccver) needs to match _gccver ($_gccver)" die "gcc6 version ($gccver) needs to match _gccver ($_gccver)"
fi fi
......
...@@ -41,7 +41,7 @@ builddir="$srcdir/$_name-$_ver" ...@@ -41,7 +41,7 @@ builddir="$srcdir/$_name-$_ver"
prepare() { prepare() {
default_prepare default_prepare
# verify the kernel version # verify the kernel version
local _kapkbuild=../../main/linux-$_flavor/APKBUILD local _kapkbuild="$startdir"/../../main/linux-$_flavor/APKBUILD
if [ -f $_kapkbuild ]; then if [ -f $_kapkbuild ]; then
( . $_kapkbuild ( . $_kapkbuild
pkgname=$_name-$_flavor pkgname=$_name-$_flavor
......
...@@ -30,7 +30,7 @@ options="!check" ...@@ -30,7 +30,7 @@ options="!check"
prepare() { prepare() {
default_prepare default_prepare
local _kapkbuild=../../main/linux-$_flavor/APKBUILD local _kapkbuild="$startdir"/../../main/linux-$_flavor/APKBUILD
if [ -f $_kapkbuild ]; then if [ -f $_kapkbuild ]; then
( . $_kapkbuild ( . $_kapkbuild
pkgname=$_name-$_flavor pkgname=$_name-$_flavor
......
...@@ -51,7 +51,7 @@ done ...@@ -51,7 +51,7 @@ done
prepare() { prepare() {
default_prepare default_prepare
# verify the kernel version # verify the kernel version
local _kapkbuild=../../main/linux-$_flavor-/APKBUILD local _kapkbuild="$startdir"/../../main/linux-$_flavor-/APKBUILD
if [ -f $_kapkbuild ]; then if [ -f $_kapkbuild ]; then
( . $_kapkbuild ( . $_kapkbuild
pkgname=$_name-$_flavor pkgname=$_name-$_flavor
......
...@@ -49,7 +49,7 @@ done ...@@ -49,7 +49,7 @@ done
prepare() { prepare() {
default_prepare default_prepare
# verify the kernel version # verify the kernel version
local _kapkbuild=../../main/linux-$_flavor-/APKBUILD local _kapkbuild="$startdir"/../../main/linux-$_flavor-/APKBUILD
if [ -f $_kapkbuild ]; then if [ -f $_kapkbuild ]; then
( . $_kapkbuild ( . $_kapkbuild
pkgname=$_name-$_flavor pkgname=$_name-$_flavor
......
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