diff options
| author |   Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2013-04-18 08:28:12 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2013-04-18 08:28:12 +0000 |
| commit | bd55c0c9878f66de2636986428d672b3da3b03c1 (patch) | |
| tree | cca63bbe81218402f12285f0ef07c6f7acd9d4ab /tools | |
| parent | Whitespace. (diff) | |
| download | releng-bd55c0c9878f66de2636986428d672b3da3b03c1.tar.gz releng-bd55c0c9878f66de2636986428d672b3da3b03c1.tar.bz2 releng-bd55c0c9878f66de2636986428d672b3da3b03c1.zip | |
Revert unintentional change to amd64 / x86 paths that is causing path weirdness on mirrors.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/catalyst-auto-amd64.conf | 12 | ||||
| -rw-r--r-- | tools/catalyst-auto-x86.conf | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 5b1a5237..4c88f2c0 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -53,20 +53,20 @@ 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} + mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP} + cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP} if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP} fi 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} + mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened + cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened fi fi } diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index 36f6b6d2..e45b0db2 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -50,20 +50,20 @@ 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} + mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP} + cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP} if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP} fi 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} + mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened + cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened fi fi } |