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

x86: Move hardened builds from pardalote to demeter

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2021-07-04 22:32:28 +02:00
parent 0773a936df
commit 0422a99519
No known key found for this signature in database
GPG key ID: 4C49F79E54D0A206
9 changed files with 29 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tools/catalyst-auto-x86-demeter.conf
View file

@ -15,6 +15,7 @@ SETS="
i486_openrc
i686_openrc
i686_systemd
hardened_openrc
"
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage2-openrc.spec i486/stage3-openrc.spec"
@ -23,13 +24,16 @@ SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage2-openrc.spec i686/stage3-openrc.spec"
SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec"
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec hardened/admincd-stage2-openrc.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened} ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
@ -51,9 +55,9 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
i486/stage3-openrc.spec)
upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
@ -69,6 +73,17 @@ post_build() {
;;
esac
popd >/dev/null || exit
pushd ${BUILD_SRCDIR_BASE}/builds/hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc.spec)
upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2-openrc.spec)
upload admincd-x86-hardened-openrc-${TIMESTAMP}.iso*
;;
esac
popd >/dev/null || exit
}
# vim:ft=sh:

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

@ -11,12 +11,8 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/specs/x86
SETS="
hardened
"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SETS=""
SPECS="nosuchfile.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86