aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-08-30 18:03:46 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-08-30 18:03:46 +0200
commit85d2d98e0ca58f724b51ad37f01cd703f37bbeb6 (patch)
tree3983f2e86f27e9e655168658a06af08b779be065
parentgkbuild.sh: Make sure that each phase starts in $S (diff)
downloadgenkernel-85d2d98e.tar.gz
genkernel-85d2d98e.tar.bz2
genkernel-85d2d98e.zip
gkbuild.sh: _initialize(): Source gkbuild after $S was defined
This will allow gkbuilds to overwrite $S like known from ebuilds. Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--worker_modules/gkbuild.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 92c73797..74a25052 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -247,9 +247,6 @@ _initialize() {
die "Unable to build ${P}: '${GK_SHARE}/gkbuilds/${PN}.gkbuild' does NOT exist!"
fi
- source "${GKBUILD}" \
- || die "Failed to source '${GKBUILD}'!"
-
declare -gr WORKDIR=$(mktemp -d -p "${TEMP}" ${PN}.XXXXXXXX 2>/dev/null)
[ -z "${WORKDIR}" ] && die "mktemp failed!"
@@ -282,6 +279,9 @@ _initialize() {
S="${WORKDIR}/${GKPKG_SRCDIR}"
+ source "${GKBUILD}" \
+ || die "Failed to source '${GKBUILD}'!"
+
# Some tools like eltpatch (libtoolize) depend on these variables
export S D