| 1 |
commit: 11c84ac57d237be3aeccc69fe0d9d92b655618ce |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 26 22:35:19 2016 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 26 22:35:19 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=11c84ac5 |
| 7 |
|
| 8 |
Whitespace. Stop hardcoding the bz2 extension and sync updates to the scripts to the experimental scripts. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
tools/catalyst-auto-amd64-experimental.conf | 22 +++++++++++++++++----- |
| 13 |
tools/catalyst-auto-amd64.conf | 4 ++-- |
| 14 |
tools/catalyst-auto-ia64.conf | 1 - |
| 15 |
tools/catalyst-auto-s390.conf | 1 - |
| 16 |
tools/catalyst-auto-s390x.conf | 1 - |
| 17 |
tools/catalyst-auto-sparc64.conf | 2 -- |
| 18 |
tools/catalyst-auto-x86-experimental.conf | 11 +++++++++-- |
| 19 |
7 files changed, 28 insertions(+), 14 deletions(-) |
| 20 |
|
| 21 |
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf |
| 22 |
index 3f2bd16..817c953 100644 |
| 23 |
--- a/tools/catalyst-auto-amd64-experimental.conf |
| 24 |
+++ b/tools/catalyst-auto-amd64-experimental.conf |
| 25 |
@@ -9,18 +9,28 @@ source /etc/catalyst/release/build.env |
| 26 |
|
| 27 |
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} |
| 28 |
|
| 29 |
-#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" |
| 30 |
-SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib" |
| 31 |
+SETS=" |
| 32 |
+ multilib cloud_multilib |
| 33 |
+ nomultilib cloud_nomultilib |
| 34 |
+ x32 |
| 35 |
+ hardened_multilib cloud_hardened_multilib |
| 36 |
+ hardened_nomultilib cloud_hardened_nomultilib |
| 37 |
+ hardened_multilib_selinux hardened_nomultilib_selinux |
| 38 |
+" |
| 39 |
|
| 40 |
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" |
| 41 |
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 42 |
+SET_cloud_multilib_SPECS="stage4-cloud.spec" |
| 43 |
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" |
| 44 |
+SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec" |
| 45 |
|
| 46 |
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" |
| 47 |
|
| 48 |
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 49 |
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
| 50 |
+SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec" |
| 51 |
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" |
| 52 |
+SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec" |
| 53 |
|
| 54 |
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" |
| 55 |
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec" |
| 56 |
@@ -28,12 +38,14 @@ SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec h |
| 57 |
|
| 58 |
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH} |
| 59 |
|
| 60 |
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" |
| 61 |
+ |
| 62 |
give_latest_from_dates() { |
| 63 |
sed 's,-20,~20,g' | \ |
| 64 |
sort -k +1 -n -t '~' |\ |
| 65 |
awk -F\~ \ |
| 66 |
- 'BEGIN{i=$1; o=$0}; |
| 67 |
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; } |
| 68 |
+ 'BEGIN{i=$1; o=$0}; |
| 69 |
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; } |
| 70 |
END { print o; };' | \ |
| 71 |
tr '~' '-' |
| 72 |
} |
| 73 |
@@ -46,7 +58,7 @@ pre_build() { |
| 74 |
# Symlink the latest stages3 to build from |
| 75 |
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
| 76 |
pushd $d |
| 77 |
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do |
| 78 |
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
| 79 |
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
| 80 |
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff |
| 81 |
ln -sf $f $of |
| 82 |
|
| 83 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
| 84 |
index 279ddfd..48dd9cf 100644 |
| 85 |
--- a/tools/catalyst-auto-amd64.conf |
| 86 |
+++ b/tools/catalyst-auto-amd64.conf |
| 87 |
@@ -53,8 +53,8 @@ give_latest_from_dates() { |
| 88 |
sed 's,-20,~20,g' | \ |
| 89 |
sort -k +1 -n -t '~' |\ |
| 90 |
awk -F\~ \ |
| 91 |
- 'BEGIN{i=$1; o=$0}; |
| 92 |
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; } |
| 93 |
+ 'BEGIN{i=$1; o=$0}; |
| 94 |
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; } |
| 95 |
END { print o; };' | \ |
| 96 |
tr '~' '-' |
| 97 |
} |
| 98 |
|
| 99 |
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf |
| 100 |
index 20c8820..8d7e3e5 100644 |
| 101 |
--- a/tools/catalyst-auto-ia64.conf |
| 102 |
+++ b/tools/catalyst-auto-ia64.conf |
| 103 |
@@ -12,7 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 104 |
|
| 105 |
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/ia64 |
| 106 |
|
| 107 |
- |
| 108 |
give_latest_from_dates() { |
| 109 |
sed 's,-20,~20,g' | \ |
| 110 |
sort -k +1 -n -t '~' |\ |
| 111 |
|
| 112 |
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf |
| 113 |
index 7e37997..f87fb03 100644 |
| 114 |
--- a/tools/catalyst-auto-s390.conf |
| 115 |
+++ b/tools/catalyst-auto-s390.conf |
| 116 |
@@ -12,7 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec" |
| 117 |
|
| 118 |
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390 |
| 119 |
|
| 120 |
- |
| 121 |
give_latest_from_dates() { |
| 122 |
sed 's,-20,~20,g' | \ |
| 123 |
sort -k +1 -n -t '~' |\ |
| 124 |
|
| 125 |
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf |
| 126 |
index 39047e7..24a1384 100644 |
| 127 |
--- a/tools/catalyst-auto-s390x.conf |
| 128 |
+++ b/tools/catalyst-auto-s390x.conf |
| 129 |
@@ -12,7 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec" |
| 130 |
|
| 131 |
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390 |
| 132 |
|
| 133 |
- |
| 134 |
give_latest_from_dates() { |
| 135 |
sed 's,-20,~20,g' | \ |
| 136 |
sort -k +1 -n -t '~' |\ |
| 137 |
|
| 138 |
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf |
| 139 |
index 72ade0a..2f1834a 100644 |
| 140 |
--- a/tools/catalyst-auto-sparc64.conf |
| 141 |
+++ b/tools/catalyst-auto-sparc64.conf |
| 142 |
@@ -12,8 +12,6 @@ SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.sp |
| 143 |
|
| 144 |
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc |
| 145 |
|
| 146 |
-EMAIL_SUBJECT_PREPEND="[sparc64-auto]" |
| 147 |
- |
| 148 |
give_latest_from_dates() { |
| 149 |
sed 's,-20,~20,g' | \ |
| 150 |
sort -k +1 -n -t '~' |\ |
| 151 |
|
| 152 |
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf |
| 153 |
index ece0e5a..379adc0 100644 |
| 154 |
--- a/tools/catalyst-auto-x86-experimental.conf |
| 155 |
+++ b/tools/catalyst-auto-x86-experimental.conf |
| 156 |
@@ -9,10 +9,15 @@ source /etc/catalyst/release/build.env |
| 157 |
|
| 158 |
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} |
| 159 |
|
| 160 |
-SETS="i486 i686 hardened" |
| 161 |
+SETS=" |
| 162 |
+ i486 |
| 163 |
+ i686 |
| 164 |
+ hardened |
| 165 |
+" |
| 166 |
|
| 167 |
SET_i486_SPECS="stage1.spec stage2.spec stage3.spec" |
| 168 |
SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 169 |
+ |
| 170 |
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec" |
| 171 |
|
| 172 |
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 173 |
@@ -20,6 +25,8 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage |
| 174 |
|
| 175 |
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH} |
| 176 |
|
| 177 |
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" |
| 178 |
+ |
| 179 |
give_latest_from_dates() { |
| 180 |
sed 's,-20,~20,g' | \ |
| 181 |
sort -k +1 -n -t '~' |\ |
| 182 |
@@ -38,7 +45,7 @@ pre_build() { |
| 183 |
# Symlink the latest stages3 to build from |
| 184 |
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
| 185 |
pushd $d |
| 186 |
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do |
| 187 |
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
| 188 |
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
| 189 |
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff |
| 190 |
ln -sf $f $of |
Archives