diff options
| -rwxr-xr-x | fullpkg | 6 | ||||
| -rwxr-xr-x | libremakepkg | 9 |
2 files changed, 7 insertions, 8 deletions
@@ -36,8 +36,6 @@ function usage { echo " -m max_level : check deps until this level" echo " -r \"command\" : use this instead of \"$FULLBUILDCMD\"" echo " -o : work offline (avoid queuing)" - # printf " -f pkgname : build even when a package has been built. " - # printf " Use it as many times as needed\n" echo } @@ -259,9 +257,7 @@ function _pkg_build () { msg2 "Checking for non free deps" pkgbuild-check-nonfree || { -# pkgbuild-check-nonfree fails with 15 if there are nonfree deps, -# fails with something else if blacklist can't be retrieved - if [ $? -eq 15 ]; then + if [ $? -eq 15 ]; then # this error means nonfree others means fail. # log they have nonfree deps and so didn't build echo "nonfree:$(basename $PWD)" >> $build_dir/log # take out package from $buildorder diff --git a/libremakepkg b/libremakepkg index dfcdbe0..d98d94a 100755 --- a/libremakepkg +++ b/libremakepkg @@ -115,8 +115,9 @@ if [ "${UPDATE_FIRST}" = y ]; then msg "Updating the chroot in use" # -c option in mkarchroot indicates cache mkarchroot -c ${CACHEDIR} -u "${CHROOTDIR}/${CHROOTNAME}" +fi -elif [ "${CLEAN_FIRST}" = y ]; then +if [ "${CLEAN_FIRST}" = y ]; then msg "Cleaning ..." cp "/etc/libretools.d/cleansystem" "${CHROOTDIR}/${CHROOTNAME}/root" (cat <<EOF @@ -131,9 +132,11 @@ EOF ) > "${CHROOTDIR}/${CHROOTNAME}/clean" mkarchroot -r "/clean" "${CHROOTDIR}/${CHROOTNAME}" -elif [ -n ${PKGINSTALL} ]; then +fi + +if [ -n ${PKGINSTALL} ]; then msg "Installing packages" - makechrootpkg -r ${PKGINSTALL} + makechrootpkg -r ${PKGINSTALL} "${CHROOTDIR}/${CHROOTNAME}" fi buildenv |