x86: copy catalyst-auto config for demeter, move i486 there only so far
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
parent
bc1f41fc26
commit
16e795ced4
|
@ -1,10 +1,10 @@
|
||||||
subarch: i486
|
subarch: i486
|
||||||
version_stamp: @TIMESTAMP@
|
version_stamp: openrc-@TIMESTAMP@
|
||||||
target: livecd-stage1
|
target: livecd-stage1
|
||||||
rel_type: default
|
rel_type: default
|
||||||
profile: default/linux/x86/17.0
|
profile: default/linux/x86/17.0
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage3-i486-@TIMESTAMP@
|
source_subpath: default/stage3-i486-openrc-@TIMESTAMP@
|
||||||
compression_mode: pixz_x
|
compression_mode: pixz_x
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/isos
|
portage_confdir: @REPO_DIR@/releases/portage/isos
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
subarch: i486
|
subarch: i486
|
||||||
version_stamp: @TIMESTAMP@
|
version_stamp: openrc-@TIMESTAMP@
|
||||||
target: livecd-stage2
|
target: livecd-stage2
|
||||||
rel_type: default
|
rel_type: default
|
||||||
profile: default/linux/x86/17.0
|
profile: default/linux/x86/17.0
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/livecd-stage1-i486-@TIMESTAMP@
|
source_subpath: default/livecd-stage1-i486-openrc-@TIMESTAMP@
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/isos
|
portage_confdir: @REPO_DIR@/releases/portage/isos
|
||||||
|
|
||||||
livecd/bootargs: dokeymap
|
livecd/bootargs: dokeymap
|
||||||
#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
|
#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
|
||||||
livecd/fstype: squashfs
|
livecd/fstype: squashfs
|
||||||
livecd/iso: install-x86-minimal-@TIMESTAMP@.iso
|
livecd/iso: install-x86-minimal-openrc-@TIMESTAMP@.iso
|
||||||
livecd/type: gentoo-release-minimal
|
livecd/type: gentoo-release-minimal
|
||||||
livecd/volid: Gentoo x86 @TIMESTAMP@
|
livecd/volid: Gentoo x86 @TIMESTAMP@
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: i486
|
subarch: i486
|
||||||
target: stage1
|
target: stage1
|
||||||
version_stamp: @TIMESTAMP@
|
version_stamp: openrc-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: default
|
||||||
profile: default/linux/x86/17.0
|
profile: default/linux/x86/17.0
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage3-i486-latest
|
source_subpath: default/stage3-i486-openrc-latest
|
||||||
compression_mode: pixz_x
|
compression_mode: pixz_x
|
||||||
update_seed: yes
|
update_seed: yes
|
||||||
update_seed_command: --update --deep --newuse @world
|
update_seed_command: --update --deep --newuse @world
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: i486
|
subarch: i486
|
||||||
target: stage2
|
target: stage2
|
||||||
version_stamp: @TIMESTAMP@
|
version_stamp: openrc-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: default
|
||||||
profile: default/linux/x86/17.0
|
profile: default/linux/x86/17.0
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage1-i486-@TIMESTAMP@
|
source_subpath: default/stage1-i486-openrc-@TIMESTAMP@
|
||||||
compression_mode: pixz_x
|
compression_mode: pixz_x
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||||
portage_prefix: releng
|
portage_prefix: releng
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: i486
|
subarch: i486
|
||||||
target: stage3
|
target: stage3
|
||||||
version_stamp: @TIMESTAMP@
|
version_stamp: openrc-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: default
|
||||||
profile: default/linux/x86/17.0
|
profile: default/linux/x86/17.0
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage2-i486-@TIMESTAMP@
|
source_subpath: default/stage2-i486-openrc-@TIMESTAMP@
|
||||||
compression_mode: pixz_x
|
compression_mode: pixz_x
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||||
portage_prefix: releng
|
portage_prefix: releng
|
63
tools/catalyst-auto-x86-demeter.conf
Normal file
63
tools/catalyst-auto-x86-demeter.conf
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
# This is the config file for the catalyst-auto script. It should be pretty
|
||||||
|
# self-explanatory.
|
||||||
|
|
||||||
|
UPLOAD_USER=x86
|
||||||
|
UPLOAD_KEY=/root/.ssh/id_rsa
|
||||||
|
host=$(hostname)
|
||||||
|
|
||||||
|
ARCH="x86"
|
||||||
|
TYPE="auto"
|
||||||
|
|
||||||
|
SPECS_DIR=${REPO_DIR}/releases/specs/x86
|
||||||
|
|
||||||
|
SETS="
|
||||||
|
i486_openrc
|
||||||
|
"
|
||||||
|
|
||||||
|
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage2-openrc.spec i486/stage3-openrc.spec"
|
||||||
|
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-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}/{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
|
||||||
|
# 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
|
||||||
|
|
||||||
|
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
|
||||||
|
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
|
||||||
|
case ${spec} in
|
||||||
|
i486/stage3-openrc.spec)
|
||||||
|
upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
|
||||||
|
;;
|
||||||
|
i486/installcd-stage2-minimal-openrc.spec)
|
||||||
|
upload install-x86-minimal-openrc-${TIMESTAMP}.iso*
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
popd >/dev/null || exit
|
||||||
|
}
|
||||||
|
|
||||||
|
# vim:ft=sh:
|
|
@ -12,15 +12,11 @@ source /etc/catalyst/release/build.env
|
||||||
SPECS_DIR=${REPO_DIR}/releases/specs/x86
|
SPECS_DIR=${REPO_DIR}/releases/specs/x86
|
||||||
|
|
||||||
SETS="
|
SETS="
|
||||||
i486
|
|
||||||
i686
|
i686
|
||||||
i686_systemd
|
i686_systemd
|
||||||
hardened
|
hardened
|
||||||
"
|
"
|
||||||
|
|
||||||
SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
|
|
||||||
SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
|
|
||||||
|
|
||||||
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
|
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
|
||||||
|
|
||||||
SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
|
SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
|
||||||
|
|
Loading…
Reference in a new issue