1 |
commit: 8f6370f8b309fbc8f958557f25f9c090c6345644 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 16 01:42:19 2018 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 16 01:42:19 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f6370f8 |
7 |
|
8 |
catalyst-auto: run update_symlinks by default in pre_build |
9 |
|
10 |
All configs defining update_symlinks run it in pre_build, and all the |
11 |
other configs will want to do the same. So make it the default in the |
12 |
pre_build phase. |
13 |
|
14 |
tools/catalyst-auto | 2 +- |
15 |
tools/catalyst-auto-amd64-experimental.conf | 4 ---- |
16 |
tools/catalyst-auto-amd64.conf | 4 ---- |
17 |
3 files changed, 1 insertion(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/tools/catalyst-auto b/tools/catalyst-auto |
20 |
index cd23d159..750e7047 100755 |
21 |
--- a/tools/catalyst-auto |
22 |
+++ b/tools/catalyst-auto |
23 |
@@ -94,7 +94,7 @@ update_symlinks() { |
24 |
pre_build() { |
25 |
# This is a skeleton function that you can override from the config file. |
26 |
# It will be executed before the build is started. |
27 |
- : |
28 |
+ update_symlinks |
29 |
} |
30 |
|
31 |
post_build() { |
32 |
|
33 |
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf |
34 |
index e4766949..70963a0a 100644 |
35 |
--- a/tools/catalyst-auto-amd64-experimental.conf |
36 |
+++ b/tools/catalyst-auto-amd64-experimental.conf |
37 |
@@ -71,10 +71,6 @@ update_symlinks() { |
38 |
done |
39 |
} |
40 |
|
41 |
-pre_build() { |
42 |
- update_symlinks |
43 |
-} |
44 |
- |
45 |
post_build() { |
46 |
cmd=( |
47 |
rsync |
48 |
|
49 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
50 |
index a2a0abdc..e469a487 100644 |
51 |
--- a/tools/catalyst-auto-amd64.conf |
52 |
+++ b/tools/catalyst-auto-amd64.conf |
53 |
@@ -75,10 +75,6 @@ update_symlinks() { |
54 |
done |
55 |
} |
56 |
|
57 |
-pre_build() { |
58 |
- update_symlinks |
59 |
-} |
60 |
- |
61 |
post_build() { |
62 |
cmd=( |
63 |
rsync |