From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-878586-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E16741381F1
for <garchives@archives.gentoo.org>; Wed, 27 Apr 2016 01:59:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9F73821C013;
Wed, 27 Apr 2016 01:59:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E08A521C013
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Apr 2016 01:59:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 87ED3340AA1
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Apr 2016 01:59:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E5B295D
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Apr 2016 01:59:19 +0000 (UTC)
From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
Message-ID: <1461722331.407605789e064db87d803b98c220e2fd2f7fbe53.jmbsvicetto@gentoo>
Subject: [gentoo-commits] proj/releng:master commit in: tools/
X-VCS-Repository: proj/releng
X-VCS-Files: tools/catalyst-auto-amd64-experimental.conf tools/catalyst-auto-x86-experimental.conf
X-VCS-Directories: tools/
X-VCS-Committer: jmbsvicetto
X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto
X-VCS-Revision: 407605789e064db87d803b98c220e2fd2f7fbe53
X-VCS-Branch: master
Date: Wed, 27 Apr 2016 01:59:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 25eb4056-25ef-453f-b699-594b2d898261
X-Archives-Hash: d34459099624377f950a0ba7cb946537
commit: 407605789e064db87d803b98c220e2fd2f7fbe53
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 01:58:51 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 01:58:51 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=40760578
Change copy logic.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 29 +++++++++++++++++++----------
tools/catalyst-auto-x86-experimental.conf | 28 ++++++++++++++++++----------
2 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 817c953..9317650 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -69,23 +69,32 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
+ done
+
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
+
+
}
# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 379adc0..f8beb81 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -56,22 +56,30 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso* ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
+ done
+
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
+ done
+
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
}