makechrootpkg: Check if build was successful. Copy package to cwd and cleanup $chrootdir/rw/build on success, keep directory contents on failure.
Signed-off-by: Jason Chu <jchu@xentac.net>
This commit is contained in:
parent
e71c9784b5
commit
ceb84394f9
|
@ -11,6 +11,7 @@
|
||||||
FORCE="n"
|
FORCE="n"
|
||||||
RUN=""
|
RUN=""
|
||||||
MAKEPKG_ARGS="-Ss"
|
MAKEPKG_ARGS="-Ss"
|
||||||
|
WORKDIR=$PWD
|
||||||
|
|
||||||
chrootdir="$CHROOT_SHELL"
|
chrootdir="$CHROOT_SHELL"
|
||||||
|
|
||||||
|
@ -114,12 +115,20 @@ fi
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
export LANG=$LOCALE
|
export LANG=$LOCALE
|
||||||
cd /build
|
cd /build
|
||||||
sudo -u nobody makepkg $MAKEPKG_ARGS
|
sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
|
||||||
EOF
|
EOF
|
||||||
) > "$uniondir/chrootbuild"
|
) > "$uniondir/chrootbuild"
|
||||||
chmod +x "$uniondir/chrootbuild"
|
chmod +x "$uniondir/chrootbuild"
|
||||||
|
|
||||||
mkarchroot -r "/chrootbuild" "$uniondir"
|
mkarchroot -r "/chrootbuild" "$uniondir"
|
||||||
|
|
||||||
# TODO move relevant files here
|
if [ -e ${chrootdir}/rw/build/BUILD_FAILED ]; then
|
||||||
echo "build complete... check \$CHROOT_SHELL/build for build results"
|
echo "Build failed, check \$CHROOT_DIR/rw/build"
|
||||||
|
rm ${chrootdir}/rw/build/BUILD_FAILED
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
source ${WORKDIR}/PKGBUILD
|
||||||
|
mv ${chrootdir}/rw/build/${pkgname}-${pkgver}-*.pkg.tar.gz ${WORKDIR}
|
||||||
|
rm -rf ${chrootdir}/rw/build/*
|
||||||
|
echo "Build complete"
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in New Issue