From cb652173f6d910bcad4eb9be2ac0781d983b2ae2 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 15 Jan 2018 20:44:31 -0500
Subject: [PATCH] catalyst-auto: move remaining configs from pre_build to
 update_symlinks

All the configs running symlink updates in pre_build can do it in the
update_symlinks callback instead.  Convert them over.
---
 tools/catalyst-auto-alpha.conf            | 3 +--
 tools/catalyst-auto-arm64.conf            | 3 +--
 tools/catalyst-auto-armv4tl.conf          | 2 +-
 tools/catalyst-auto-armv5tel.conf         | 2 +-
 tools/catalyst-auto-armv6j.conf           | 2 +-
 tools/catalyst-auto-armv6j_hardfp.conf    | 2 +-
 tools/catalyst-auto-armv7a.conf           | 2 +-
 tools/catalyst-auto-armv7a_hardfp.conf    | 2 +-
 tools/catalyst-auto-hppa.conf             | 3 +--
 tools/catalyst-auto-ia64.conf             | 3 +--
 tools/catalyst-auto-ppc.conf              | 2 +-
 tools/catalyst-auto-ppc64.conf            | 3 +--
 tools/catalyst-auto-s390.conf             | 3 +--
 tools/catalyst-auto-s390x.conf            | 3 +--
 tools/catalyst-auto-sparc64.conf          | 2 +-
 tools/catalyst-auto-x86-experimental.conf | 2 +-
 tools/catalyst-auto-x86.conf              | 2 +-
 17 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index f72747ab..5b2bd2ed 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -22,8 +22,7 @@ give_latest_from_dates() {
   tr '~' '-'
 }
 
-
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index f987eb9f..e9744337 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -25,8 +25,7 @@ give_latest_from_dates() {
   tr '~' '-'
 }
 
-
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index dfa65886..9ae84d5e 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
 }
 
 
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 7ae17c0e..072b8d8a 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
 }
 
 
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 950b7f03..9a14ddf9 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
 }
 
 
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 86ae9ddb..f3295b22 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
 }
 
 
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 33138ce6..66911204 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
 }
 
 
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 55dae2e1..4dd146f5 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
 }
 
 
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 18ca85ff..9899e7da 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -27,8 +27,7 @@ give_latest_from_dates() {
   tr '~' '-'
 }
 
-
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 9f059ee3..dc91c4c4 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -22,8 +22,7 @@ give_latest_from_dates() {
   tr '~' '-'
 }
 
-
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 43d9809f..139f1a1a 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -24,7 +24,7 @@ give_latest_from_dates() {
   tr '~' '-'
 }
 
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 1dfe64a9..d9c45856 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -25,8 +25,7 @@ give_latest_from_dates() {
   tr '~' '-'
 }
 
-
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index e580032a..44b47a93 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -22,8 +22,7 @@ give_latest_from_dates() {
   tr '~' '-'
 }
 
-
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 37e543f5..c12a959e 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -22,8 +22,7 @@ give_latest_from_dates() {
   tr '~' '-'
 }
 
-
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index cca8dd58..b3364f8f 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -23,7 +23,7 @@ give_latest_from_dates() {
 }
 
 
-pre_build() {
+update_symlinks() {
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
     pushd $d >/dev/null
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index e2c19761..9092e577 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -37,7 +37,7 @@ give_latest_from_dates() {
 	tr '~' '-'
 }
 
-pre_build() {
+update_symlinks() {
 	# Symlink the latest stages3 to build from
 	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
 		pushd $d >/dev/null
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 286a9304..d2042559 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -37,7 +37,7 @@ give_latest_from_dates() {
 	tr '~' '-'
 }
 
-pre_build() {
+update_symlinks() {
 	# Symlink the latest stages3 to build from
 	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
 		pushd $d >/dev/null