| 1 |
commit: 407605789e064db87d803b98c220e2fd2f7fbe53 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 27 01:58:51 2016 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 27 01:58:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=40760578 |
| 7 |
|
| 8 |
Change copy logic. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
tools/catalyst-auto-amd64-experimental.conf | 29 +++++++++++++++++++---------- |
| 13 |
tools/catalyst-auto-x86-experimental.conf | 28 ++++++++++++++++++---------- |
| 14 |
2 files changed, 37 insertions(+), 20 deletions(-) |
| 15 |
|
| 16 |
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf |
| 17 |
index 817c953..9317650 100644 |
| 18 |
--- a/tools/catalyst-auto-amd64-experimental.conf |
| 19 |
+++ b/tools/catalyst-auto-amd64-experimental.conf |
| 20 |
@@ -69,23 +69,32 @@ pre_build() { |
| 21 |
|
| 22 |
post_build() { |
| 23 |
pushd ${BUILD_SRCDIR_BASE}/default |
| 24 |
- if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then |
| 25 |
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 26 |
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 27 |
- if [ -f *${DATESTAMP}*.iso ]; then |
| 28 |
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 29 |
+ |
| 30 |
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 31 |
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do |
| 32 |
+ if [ -f $file ]; then |
| 33 |
+ cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 34 |
fi |
| 35 |
+ done |
| 36 |
+ if [ -f *${DATESTAMP}*.iso ]; then |
| 37 |
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} |
| 38 |
fi |
| 39 |
popd |
| 40 |
|
| 41 |
pushd ${BUILD_SRCDIR_BASE}/hardened |
| 42 |
- if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then |
| 43 |
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 44 |
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 45 |
- if [ -f *${DATESTAMP}*.iso ]; then |
| 46 |
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 47 |
+ |
| 48 |
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 49 |
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do |
| 50 |
+ if [ -f $file ]; then |
| 51 |
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 52 |
fi |
| 53 |
+ done |
| 54 |
+ |
| 55 |
+ if [ -f *${DATESTAMP}*.iso ]; then |
| 56 |
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 57 |
fi |
| 58 |
+ |
| 59 |
+ |
| 60 |
} |
| 61 |
|
| 62 |
# vim:ft=sh: |
| 63 |
|
| 64 |
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf |
| 65 |
index 379adc0..f8beb81 100644 |
| 66 |
--- a/tools/catalyst-auto-x86-experimental.conf |
| 67 |
+++ b/tools/catalyst-auto-x86-experimental.conf |
| 68 |
@@ -56,22 +56,30 @@ pre_build() { |
| 69 |
|
| 70 |
post_build() { |
| 71 |
pushd ${BUILD_SRCDIR_BASE}/default |
| 72 |
- if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then |
| 73 |
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 74 |
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 75 |
- if [ -f *${DATESTAMP}*.iso* ]; then |
| 76 |
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 77 |
+ |
| 78 |
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 79 |
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do |
| 80 |
+ if [ -f $file ]; then |
| 81 |
+ cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 82 |
fi |
| 83 |
+ done |
| 84 |
+ |
| 85 |
+ if [ -f *${DATESTAMP}*.iso ]; then |
| 86 |
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} |
| 87 |
fi |
| 88 |
popd |
| 89 |
|
| 90 |
pushd ${BUILD_SRCDIR_BASE}/hardened |
| 91 |
- if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then |
| 92 |
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 93 |
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 94 |
- if [ -f *${DATESTAMP}*.iso ]; then |
| 95 |
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 96 |
+ |
| 97 |
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 98 |
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do |
| 99 |
+ if [ -f $file ]; then |
| 100 |
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 101 |
fi |
| 102 |
+ done |
| 103 |
+ |
| 104 |
+ if [ -f *${DATESTAMP}*.iso ]; then |
| 105 |
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} |
| 106 |
fi |
| 107 |
} |
Archives