commit: c2b28e8d1f36047985869c61d18e849ea47f7992
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 6 07:47:42 2014 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 6 07:47:42 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=c2b28e8d
Add netboot to s390 conf and fix s390x conf
Signed-off-by: Raúl Porcel <armin76 <AT> gentoo.org>
---
tools/catalyst-auto-s390.conf | 10 +++++++---
tools/catalyst-auto-s390x.conf | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index d7ea936..9f59c2b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -4,11 +4,13 @@
SPECS_DIR=${GITDIR}/releases/weekly/specs/s390/s390
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-SETS="default"
+SETS="default netboot"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
+SET_netboot_SPECS="netboot/netboot.spec"
+
+KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
[email protected],[email protected]
EMAIL_FROM=catalyst@$(hostname)
@@ -48,5 +50,7 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
+ mv
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/kernels/netboot
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot-s390-kernel-${DATESTAMP}
+ mv
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/kernels/misc/netboot.igz
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot-s390-initramfs-${DATESTAMP}
+ rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot*
[email protected]:
}
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 30ee386..13ba079 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -51,6 +51,6 @@ pre_build() {
post_build() {
mv
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/netboot64
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-kernel-${DATESTAMP}
- mv
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot64
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
+ mv
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot*
[email protected]:
}
