Martchus
/
devtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makechrootpkg: remove (pkg|src)dest mount check 

This is no longer needed as we don't mount-bind PKGDEST or SRCDEST

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
Aaron Griffin 2009-03-09 12:27:09 -07:00
parent b3b1cfba42
commit f7c44611fe
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
makechrootpkg
View File

@ -232,29 +232,25 @@ if mkarchroot -r "/chrootbuild" "$uniondir"; then
fi fi
local pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz local pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz
if [ -z "$(mount | grep ${chrootdir}/union/pkgdest)" ]; then if [ -e "$pkgfile" ]; then
if [ -e "$pkgfile" ]; then if [ -n "$PKGDEST" ]; then
if [ -n "$PKGDEST" ]; then echo "Moving completed package file to ${PKGDEST}"
echo "Moving completed package file to ${PKGDEST}" mv "$pkgfile" "${PKGDEST}"
mv "$pkgfile" "${PKGDEST}" else
else echo "Moving completed package file to ${WORKDIR}"
echo "Moving completed package file to ${WORKDIR}" mv "$pkgfile" "${WORKDIR}"
mv "$pkgfile" "${WORKDIR}"
fi
fi fi
fi fi
if [ -z "$(mount | grep ${chrootdir}/union/srcdest)" ]; then for f in ${chrootdir}/union/srcdest/*; do
for f in ${chrootdir}/union/srcdest/*; do [ -e "$f" ] || continue
[ -e "$f" ] || continue if [ -n "$SRCDEST" ]; then
if [ -n "$SRCDEST" ]; then echo "Moving downloaded source file ($(basename $f) to ${SRCDEST}"
echo "Moving downloaded source file ($(basename $f) to ${SRCDEST}" mv "$f" "${SRCDEST}"
mv "$f" "${SRCDEST}" else
else echo "Moving downloaded source file ($(basename $f) to ${WORKDIR}"
echo "Moving downloaded source file ($(basename $f) to ${WORKDIR}" mv "$f" "${WORKDIR}"
mv "$f" "${WORKDIR}" fi
fi done
done
fi
else else
#just in case. We returned 1, make sure we fail #just in case. We returned 1, make sure we fail
touch ${chrootdir}/union/build/BUILD_FAILED touch ${chrootdir}/union/build/BUILD_FAILED