commit: e7ded9f8dd423ecb57edf9cc25192cb46add05ec
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo
<DOT> org>
AuthorDate: Sun Dec 27 02:37:12 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 02:37:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e7ded9f8
Update catalyst-auto scripts for amd64 / x86 to add support for more targets
and improve the detection / copy of stages.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT>
gentoo.org>
tools/catalyst-auto-amd64.conf | 47 ++++++++++++++++++++++++++++--------------
tools/catalyst-auto-x86.conf | 28 +++++++++++++++----------
2 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 92162fa..5a4ec54 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -10,19 +10,28 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux"
-SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
+SETS="
+ multilib cloud_multilib
+ nomultilib cloud_nomultilib
+ x32
+ hardened_multilib cloud_hardened_multilib
+ hardened_nomultilib cloud_hardened_nomultilib
+"
+# hardened_multilib_selinux hardened_nomultilib_selinux
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec stage4-cloud.spec"
+SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
+SET_cloud_multilib_SPECS="stage4-cloud.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec
stage3-nomultilib.spec"
-SET_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-cloud.spec"
+SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec
hardened/stage3.spec"
-SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage2.spec hardened/stage4-cloud.spec"
+SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage2.spec"
+SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec
hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
+SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec
hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec
hardened/admincd-stage2-selinux.spec"
@@ -30,6 +39,8 @@
SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec h
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -48,7 +59,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls stage3*bz2 | grep -v latest |
give_latest_from_dates ) ; do
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest |
give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for
20YYMMDD stuff
ln -sf $f $of
@@ -59,22 +70,26 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f
stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+ mkdir -p ${BUILD_DESTDIR_BASE}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f
stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 7bde015..9b60c81 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -20,6 +20,8 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -38,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls stage3*bz2 | grep -v latest |
give_latest_from_dates ) ; do
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest |
give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for
20YYMMDD stuff
ln -sf $f $of
@@ -49,22 +51,26 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f
stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+ mkdir -p ${BUILD_DESTDIR_BASE}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened
- cp stage3-i686-*${DATESTAMP}*.bz2*
${BUILD_DESTDIR_BASE}/hardened
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi
}
