[gentoo-commits] proj/releng:master commit in: tools/

[Mike Frysinger]

commit:     8f6370f8b309fbc8f958557f25f9c090c6345644
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 01:42:19 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 01:42:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f6370f8

catalyst-auto: run update_symlinks by default in pre_build

All configs defining update_symlinks run it in pre_build, and all the
other configs will want to do the same.  So make it the default in the
pre_build phase.

 tools/catalyst-auto                         | 2 +-
 tools/catalyst-auto-amd64-experimental.conf | 4 ----
 tools/catalyst-auto-amd64.conf              | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cd23d159..750e7047 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -94,7 +94,7 @@ update_symlinks() {
 pre_build() {
   # This is a skeleton function that you can override from the config file.
   # It will be executed before the build is started.
-  :
+  update_symlinks
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-amd64-experimental.conf 
b/tools/catalyst-auto-amd64-experimental.conf
index e4766949..70963a0a 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -71,10 +71,6 @@ update_symlinks() {
        done
 }
 
-pre_build() {
-       update_symlinks
-}
-
 post_build() {
        cmd=(
                rsync

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a2a0abdc..e469a487 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -75,10 +75,6 @@ update_symlinks() {
        done
 }
 
-pre_build() {
-       update_symlinks
-}
-
 post_build() {
        cmd=(
                rsync