Add more checks and tests in postbuild for amd64 / x86.
This commit is contained in:
parent
76b18d9cee
commit
25a5c10300
|
@ -42,27 +42,42 @@ give_latest_from_dates() {
|
||||||
pre_build() {
|
pre_build() {
|
||||||
pushd ${REPO_DIR}
|
pushd ${REPO_DIR}
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
popd
|
popd
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||||
cd $d
|
pushd $d
|
||||||
for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
|
for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
|
||||||
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
|
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
|
||||||
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
done
|
done
|
||||||
|
popd
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
cd ${BUILD_SRCDIR_BASE}/default
|
pushd ${BUILD_SRCDIR_BASE}/default
|
||||||
cp stage3-*${DATESTAMP}*bz2* ${BUILD_DESTDIR_BASE}/
|
if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
|
||||||
if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
|
# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
|
||||||
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
|
# cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
|
||||||
|
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
|
||||||
|
if [ -f *${DATESTAMP}*.iso ]; then
|
||||||
|
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
|
||||||
|
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
cd ${BUILD_SRCDIR_BASE}/hardened
|
popd
|
||||||
if [ -n "$(ls -1 stage3-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then
|
|
||||||
|
pushd ${BUILD_SRCDIR_BASE}/hardened
|
||||||
|
if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
|
||||||
|
# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
|
||||||
|
# cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
|
||||||
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
|
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
|
||||||
|
if [ -f *${DATESTAMP}*.iso ]; then
|
||||||
|
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
|
||||||
|
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,26 +40,38 @@ give_latest_from_dates() {
|
||||||
pre_build() {
|
pre_build() {
|
||||||
pushd ${REPO_DIR}
|
pushd ${REPO_DIR}
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
popd
|
popd
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||||
cd $d
|
pushd $d
|
||||||
for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
|
for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
|
||||||
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
|
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
|
||||||
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
done
|
done
|
||||||
|
popd
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
cd ${BUILD_SRCDIR_BASE}/default
|
pushd ${BUILD_SRCDIR_BASE}/default
|
||||||
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
|
if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2* ]
|
||||||
if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
|
# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
|
||||||
|
# cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
|
||||||
|
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
|
||||||
|
if [ -f *${DATESTAMP}*.iso* ]; then
|
||||||
|
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
|
||||||
|
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
|
||||||
|
fi
|
||||||
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
|
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
|
||||||
fi
|
fi
|
||||||
cd ${BUILD_SRCDIR_BASE}/hardened
|
popd
|
||||||
if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2* 2>/dev/null)" ]; then
|
|
||||||
|
pushd ${BUILD_SRCDIR_BASE}/hardened
|
||||||
|
if [ -f stage3-i686-*${DATESTAMP}*.bz2* ]; then
|
||||||
|
# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
|
||||||
|
# cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
|
||||||
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
|
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue