From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F169513838B for ; Mon, 6 Oct 2014 07:47:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88958E08F3; Mon, 6 Oct 2014 07:47:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22347E08F3 for ; Mon, 6 Oct 2014 07:47:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D8A433FEC9 for ; Mon, 6 Oct 2014 07:47:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD03271CC for ; Mon, 6 Oct 2014 07:47:50 +0000 (UTC) From: "Raúl Porcel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Raúl Porcel" Message-ID: <1412581662.c2b28e8d1f36047985869c61d18e849ea47f7992.armin76@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-s390.conf tools/catalyst-auto-s390x.conf X-VCS-Directories: tools/ X-VCS-Committer: armin76 X-VCS-Committer-Name: Raúl Porcel X-VCS-Revision: c2b28e8d1f36047985869c61d18e849ea47f7992 X-VCS-Branch: master Date: Mon, 6 Oct 2014 07:47:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eacfa9a5-205b-4a78-ae9c-c0d2a4046a87 X-Archives-Hash: e70382a719901e0093c500a9443b09c7 commit: c2b28e8d1f36047985869c61d18e849ea47f7992 Author: Raúl Porcel gentoo org> AuthorDate: Mon Oct 6 07:47:42 2014 +0000 Commit: Raúl Porcel gentoo 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 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_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org 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* s390@nightheron.gentoo.org: + 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* s390@nightheron.gentoo.org: } 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* s390@nightheron.gentoo.org: }