915dc435ff
Previously when we were copying locally there was no (major) problem with wildcarding a long list of files to be transferred after every single spec finishes. Now that we are transferring to a remote host, this results in a lot of wasted transfer time & bandwidth. I have adjusted the post_build function to only transfer the new files known to be produced by each spec (which has files meant to be published). Signed-off-by: Ben Kohler <bkohler@gentoo.org>
141 lines
4.7 KiB
Bash
141 lines
4.7 KiB
Bash
# This is the config file for the catalyst-auto script. It should be pretty
|
|
# self-explanatory.
|
|
|
|
ARCH="amd64"
|
|
TYPE="auto"
|
|
host=$(hostname)
|
|
|
|
source /etc/catalyst/release/build.env
|
|
|
|
SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
|
|
|
|
SETS="
|
|
multilib minimal_multilib
|
|
nomultilib minimal_nomultilib
|
|
x32
|
|
hardened_multilib minimal_hardened_multilib
|
|
hardened_nomultilib minimal_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"
|
|
SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
|
|
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
|
|
SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.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"
|
|
SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
|
|
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
|
|
SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.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_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
|
|
|
|
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
|
|
|
|
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
|
|
|
|
update_symlinks() {
|
|
# Symlink the latest stages3 to build from
|
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
|
pushd "${d}" >/dev/null || exit
|
|
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
|
|
# 20yymmddThhmmssZ
|
|
# 20yymmddhhmmss
|
|
# 20yymmdd
|
|
# 20yy.n
|
|
of=$(perl -p \
|
|
-e 's/20\d{6}T\d{6}Z/latest/g;' \
|
|
-e 's/20\d{6}\d{6}/latest/g;' \
|
|
-e 's/20\d{6}/latest/g;' \
|
|
-e 's/20\d{2}\.\d{2}/latest/g;' \
|
|
<<<"$f")
|
|
ln -svf "$f" "$of"
|
|
done
|
|
popd >/dev/null || exit
|
|
done
|
|
}
|
|
|
|
post_build() {
|
|
local set=$1 spec=$2
|
|
|
|
cmd=(
|
|
rsync
|
|
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
|
|
-a
|
|
--omit-dir-times
|
|
--delay-updates
|
|
)
|
|
case $HOSTNAME in
|
|
# If you ever need to ensure it's copied somewhere local, drop a hostname in here!
|
|
LOCAL)
|
|
DEST_DEFAULT=${BUILD_DESTDIR_BASE}
|
|
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
|
|
;;
|
|
*)
|
|
DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
|
|
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
|
|
;;
|
|
esac
|
|
|
|
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
|
|
case ${spec} in
|
|
stage3.spec)
|
|
"${cmd[@]}" stage3-amd64-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
|
;;
|
|
installcd-stage2-minimal.spec)
|
|
"${cmd[@]}" install-amd64-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
|
|
;;
|
|
stage4-minimal.spec)
|
|
"${cmd[@]}" stage4-amd64-minimal-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
|
;;
|
|
stage3-nomultilib.spec)
|
|
"${cmd[@]}" stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
|
;;
|
|
stage4-nomultilib-minimal.spec)
|
|
"${cmd[@]}" stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
|
;;
|
|
stage3-x32.spec)
|
|
"${cmd[@]}" stage3-x32-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
|
;;
|
|
esac
|
|
popd >/dev/null || exit
|
|
|
|
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
|
|
case ${spec} in
|
|
hardened/stage3.spec)
|
|
"${cmd[@]}" stage3-amd64-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
|
;;
|
|
hardened/admincd-stage2.spec)
|
|
"${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
|
|
;;
|
|
hardened/stage4-minimal.spec)
|
|
"${cmd[@]}" stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
|
;;
|
|
hardened/stage3-nomultilib.spec)
|
|
"${cmd[@]}" stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
|
;;
|
|
hardened/stage4-nomultilib-minimal.spec)
|
|
"${cmd[@]}" stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
|
;;
|
|
hardened/stage3-selinux.spec)
|
|
"${cmd[@]}" stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
|
;;
|
|
hardened/admincd-stage2-selinux.spec)
|
|
"${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
|
|
;;
|
|
hardened/stage3-selinux-nomultilib.spec)
|
|
"${cmd[@]}" stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
|
;;
|
|
esac
|
|
popd >/dev/null || exit
|
|
}
|
|
|
|
# vim:ft=sh:
|