chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update catalyst-auto scripts for amd64 / x86 to add support for more targets and improve the detection / copy of stages.

Browse source 
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
This commit is contained in:
Jorge Manuel B. S. Vicetto (jmbsvicetto) 2015-12-27 02:37:12 +00:00
parent 24e8d22fc7
commit e7ded9f8dd
2 changed files with 48 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
tools/catalyst-auto-amd64.conf
View file

@ -10,19 +10,28 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} 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 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_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_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_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_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/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_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" 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} KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
give_latest_from_dates() { give_latest_from_dates() {
sed 's,-20,~20,g' | \ sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\ sort -k +1 -n -t '~' |\
@ -48,7 +59,7 @@ pre_build() {
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d 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=${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 of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of ln -sf $f $of
@ -59,22 +70,26 @@ pre_build() {
post_build() { post_build() {
pushd ${BUILD_SRCDIR_BASE}/default 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}
mkdir -p ${BUILD_DESTDIR_BASE} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE} if [ -f $file ]; then
if [ -f *${DATESTAMP}*.iso ]; then cp $file* ${BUILD_DESTDIR_BASE}
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi fi
done
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi fi
popd popd
pushd ${BUILD_SRCDIR_BASE}/hardened 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
mkdir -p ${BUILD_DESTDIR_BASE}/hardened for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened if [ -f $file ]; then
if [ -f *${DATESTAMP}*.iso ]; then cp $file* ${BUILD_DESTDIR_BASE}/hardened
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi fi
done
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi fi
} }

28
tools/catalyst-auto-x86.conf
View file

@ -20,6 +20,8 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH} KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
give_latest_from_dates() { give_latest_from_dates() {
sed 's,-20,~20,g' | \ sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\ sort -k +1 -n -t '~' |\
@ -38,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d 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=${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 of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of ln -sf $f $of
@ -49,22 +51,26 @@ pre_build() {
post_build() { post_build() {
pushd ${BUILD_SRCDIR_BASE}/default pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then mkdir -p ${BUILD_DESTDIR_BASE}
mkdir -p ${BUILD_DESTDIR_BASE} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE} if [ -f $file ]; then
if [ -f *${DATESTAMP}*.iso ]; then cp $file* ${BUILD_DESTDIR_BASE}
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi fi
done
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi fi
popd popd
pushd ${BUILD_SRCDIR_BASE}/hardened pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then mkdir -p ${BUILD_DESTDIR_BASE}/hardened
mkdir -p ${BUILD_DESTDIR_BASE}/hardened for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened if [ -f $file ]; then
if [ -f *${DATESTAMP}*.iso ]; then cp $file* ${BUILD_DESTDIR_BASE}/hardened
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi fi
done
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi fi
} }