makechrootpkg: fixed copying of split packages
This patch fixed copying of packages with splitting (FS#16181) It also adds missing quotes around chrootdir variable. Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
parent
71a6d2c895
commit
06b02906b8
|
@ -225,31 +225,28 @@ if mkarchroot -r "/chrootbuild" "$uniondir"; then
|
||||||
[ -f /etc/makepkg.conf ] && source /etc/makepkg.conf
|
[ -f /etc/makepkg.conf ] && source /etc/makepkg.conf
|
||||||
[ -f ~/.makepkg.conf ] && source ~/.makepkg.conf
|
[ -f ~/.makepkg.conf ] && source ~/.makepkg.conf
|
||||||
|
|
||||||
source ${WORKDIR}/PKGBUILD
|
for pkgfile in "${chrootdir}"/union/pkgdest/*${PKGEXT}; do
|
||||||
|
[ -e "$pkgfile" ] || continue
|
||||||
|
_pkgname=$(basename "$pkgfile")
|
||||||
|
if [ -n "$add_to_db" ]; then
|
||||||
|
|
||||||
for _pkgname in ${pkgname[@]}; do
|
|
||||||
pkgfile="${chrootdir}"/union/pkgdest/${_pkgname}-*${PKGEXT}
|
|
||||||
|
|
||||||
if [ -n "$add_to_db" -a -e "$pkgfile" ]; then
|
|
||||||
[ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo"
|
[ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo"
|
||||||
pushd "${chrootdir}/union/repo" >/dev/null
|
pushd "${chrootdir}/union/repo" >/dev/null
|
||||||
cp "$pkgfile" .
|
cp "$pkgfile" .
|
||||||
repo-add repo.db.tar.${DB_COMPRESSION} ${_pkgname}-${pkgver}-${pkgrel}-*${PKGEXT}
|
repo-add repo.db.tar.${DB_COMPRESSION} "$_pkgname"
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e $pkgfile ]; then
|
if [ -n "$PKGDEST" ]; then
|
||||||
if [ -n "$PKGDEST" ]; then
|
echo "Moving completed ${_pkgname%${PKGEXT}} package file to ${PKGDEST}"
|
||||||
echo "Moving completed ${_pkgname} package file to ${PKGDEST}"
|
mv "$pkgfile" "${PKGDEST}"
|
||||||
mv $pkgfile "${PKGDEST}"
|
else
|
||||||
else
|
echo "Moving completed ${_pkgname%${PKGEXT}} package file to ${WORKDIR}"
|
||||||
echo "Moving completed ${_pkgname} package file to ${WORKDIR}"
|
mv "$pkgfile" "${WORKDIR}"
|
||||||
mv $pkgfile "${WORKDIR}"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
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}"
|
||||||
|
@ -261,14 +258,14 @@ if mkarchroot -r "/chrootbuild" "$uniondir"; then
|
||||||
done
|
done
|
||||||
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"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e ${chrootdir}/union/build/BUILD_FAILED ]; then
|
if [ -e "${chrootdir}/union/build/BUILD_FAILED" ]; then
|
||||||
echo "Build failed, check $chrootdir/$LAYER/build"
|
echo "Build failed, check $chrootdir/$LAYER/build"
|
||||||
rm ${chrootdir}/union/build/BUILD_FAILED
|
rm "${chrootdir}/union/build/BUILD_FAILED"
|
||||||
else
|
else
|
||||||
rm -rf ${chrootdir}/union/build/*
|
rm -rf "${chrootdir}"/union/build/*
|
||||||
echo "Build complete"
|
echo "Build complete"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue