pktsurf/smlinux
1
1
Fork 0
Code Issues 1 Pull requests Wiki Activity

Added ignorebinlib variable check in bldpkg to allow exceptional packages to include certain directories and also reset ccache to 0

Browse source
This commit is contained in:
PktSurf 2024-11-03 22:30:09 +05:30
parent 8f942da698
commit 940148649f
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bldpkg
View file

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