diff --git a/bldpkg b/bldpkg index a684cc8..1fb24f6 100755 --- a/bldpkg +++ b/bldpkg @@ -514,11 +514,13 @@ mkfinalpkg() { info "Performing packaging tasks..." # We don't want several directories because we are following the merge-usr principle - for directory in bin sbin lib lib64 share include usr/etc usr/sbin usr/lib64 usr/local ; do - if [[ -d $directory ]] ; then - err "$pkg/$directory is a symlink to '/usr'. Fix your build file and ensure such a directory is not created" - fi - done + if [[ -z $ignorebinlib ]]; then + for directory in bin sbin lib lib64 share include usr/etc usr/sbin usr/lib64 usr/local ; do + if [[ -d $directory ]] ; then + err "$pkg/$directory is a symlink to '/usr'. Fix your build file and ensure such a directory is not created" + fi + done + fi info "Copying post-install files..." @@ -626,9 +628,11 @@ EOF find "$pkg" -name "charset.alias" -exec rm -v {} \; # Also discard the lib and install directory if it's empty but don't error out - for dir in lib usr/lib usr/share usr/lib64 install ; do - rmdir $dir &> /dev/null || true - done + if [[ -z ignorebinlib ]] ; then + for dir in lib usr/lib usr/share usr/lib64 install ; do + rmdir $dir &> /dev/null || true + done + fi tar cvf - . --format gnu \ --xform 'sx^\./\(.\)x\1x' \ @@ -950,7 +954,7 @@ stage0prep() { tmpfsenabledforthispackage=1 # Disable ccache - ccache=1 + ccache=0 # Override preservebuilddir and preservepackagedir to remove both build and package staging directories preservebuilddir=0