Revert unintentional change to amd64 / x86 paths that is causing path weirdness on mirrors.
This commit is contained in:
parent
08c9ca74d6
commit
bd55c0c987
2 changed files with 12 additions and 12 deletions
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue