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

Update config for amd64 / x86 to store stages under {default,hardened}.

Browse source
This commit is contained in:
Jorge Manuel B. S. Vicetto (jmbsvicetto) 2012-10-11 06:13:20 +00:00
parent 104107c2b0
commit 8ee2ae6b0f
2 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,8 +7,7 @@ ARCH="amd64"
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="multilib nomultilib hardened_multilib hardened_nomultilib" SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
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" SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
@ -59,24 +58,20 @@ 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 if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
# cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
if [ -f *${DATESTAMP}*.iso ]; then if [ -f *${DATESTAMP}*.iso ]; then
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
fi fi
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 if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
# cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
if [ -f *${DATESTAMP}*.iso ]; then if [ -f *${DATESTAMP}*.iso ]; then
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
fi fi
fi fi
} }

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

@ -57,24 +57,20 @@ 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 if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
# cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
if [ -f *${DATESTAMP}*.iso* ]; then if [ -f *${DATESTAMP}*.iso* ]; then
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
fi fi
fi fi
popd popd
pushd ${BUILD_SRCDIR_BASE}/hardened pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
# cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
if [ -f *${DATESTAMP}*.iso ]; then if [ -f *${DATESTAMP}*.iso ]; then
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
fi fi
fi fi
} }