1 |
commit: 53988165c9b7b1452e86f216b4463fabbf8e95c9 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 30 16:02:07 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 30 16:02:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=53988165 |
7 |
|
8 |
gkbuild.sh: Make sure that each phase starts in $S |
9 |
|
10 |
...not just the default functions. |
11 |
|
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
worker_modules/gkbuild.sh | 13 ++++--------- |
15 |
1 file changed, 4 insertions(+), 9 deletions(-) |
16 |
|
17 |
diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh |
18 |
index 136fe17..92c7379 100644 |
19 |
--- a/worker_modules/gkbuild.sh |
20 |
+++ b/worker_modules/gkbuild.sh |
21 |
@@ -81,19 +81,22 @@ _gkbuild_main() { |
22 |
case "${current_phase}" in |
23 |
src_compile) |
24 |
print_info 2 "$(get_indent 2)${P}: >> Compiling source ..." |
25 |
+ cd "${S}" || die "Failed to chdir to '${S}'!" |
26 |
;; |
27 |
|
28 |
src_configure) |
29 |
print_info 2 "$(get_indent 2)${P}: >> Configuring source ..." |
30 |
- declare -ga CONFIGUREOPTS |
31 |
+ cd "${S}" || die "Failed to chdir to '${S}'!" |
32 |
;; |
33 |
|
34 |
src_install) |
35 |
print_info 2 "$(get_indent 2)${P}: >> Install to DESTDIR ..." |
36 |
+ cd "${S}" || die "Failed to chdir to '${S}'!" |
37 |
;; |
38 |
|
39 |
src_prepare) |
40 |
print_info 2 "$(get_indent 2)${P}: >> Preparing source ..." |
41 |
+ cd "${S}" || die "Failed to chdir to '${S}'!" |
42 |
;; |
43 |
|
44 |
src_unpack) |
45 |
@@ -331,8 +334,6 @@ _initialize() { |
46 |
} |
47 |
|
48 |
_src_compile() { |
49 |
- cd "${S}" || die "Failed to chdir to '${S}'!" |
50 |
- |
51 |
if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ] |
52 |
then |
53 |
gkmake V=1 |
54 |
@@ -340,8 +341,6 @@ _src_compile() { |
55 |
} |
56 |
|
57 |
_src_configure() { |
58 |
- cd "${S}" || die "Failed to chdir to '${S}'!" |
59 |
- |
60 |
if [[ -x ${GKCONF_SOURCE:-.}/configure ]] |
61 |
then |
62 |
gkconf |
63 |
@@ -349,8 +348,6 @@ _src_configure() { |
64 |
} |
65 |
|
66 |
_src_install() { |
67 |
- cd "${S}" || die "Failed to chdir to '${S}'!" |
68 |
- |
69 |
if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ] |
70 |
then |
71 |
gkmake V=1 DESTDIR="${D}" install |
72 |
@@ -358,8 +355,6 @@ _src_install() { |
73 |
} |
74 |
|
75 |
_src_prepare() { |
76 |
- cd "${S}" || die "Failed to chdir to '${S}'!" |
77 |
- |
78 |
# let's try to be smart and run autoreconf only when needed |
79 |
local want_autoreconf=${WANT_AUTORECONF} |