xbps-src: only add files and links into the resulting binpkg.

Additional dirs and permissions on them can be set via mkdirs triggers
(and make_dirs var) and INSTALL/REMOVE scripts.

Those dirs are in 90% cases redundant as they always have the same
permissions bits (0755), all packages using special permissions have
been modified and adapted.
This commit is contained in:
Juan RP 2011-11-09 20:44:01 +01:00
parent 162bfe4697
commit fad78ea7f1

View file

@ -59,7 +59,7 @@ binpkg_cleanup()
# #
xbps_make_binpkg_real() xbps_make_binpkg_real()
{ {
local mfiles binpkg pkgdir arch dirs _dirs d clevel local mfiles binpkg pkgdir arch d clevel
if [ ! -d "${DESTDIR}" ]; then if [ ! -d "${DESTDIR}" ]; then
msg_warn "cannot find destdir for $pkgname... skipping!\n" msg_warn "cannot find destdir for $pkgname... skipping!\n"
@ -99,10 +99,14 @@ xbps_make_binpkg_real()
mfiles="./REMOVE" mfiles="./REMOVE"
fi fi
mfiles="$mfiles ./files.plist ./props.plist" mfiles="$mfiles ./files.plist ./props.plist"
_dirs=$(find . -maxdepth 1 -type d -o -type l) for d in $(find . -type f -o -type l); do
for d in ${_dirs}; do if [ "$d" = "./INSTALL" -o \
[ "$d" = "." ] && continue "$d" = "./REMOVE" -o \
dirs="$d $dirs" "$d" = "./files.plist" -o \
"$d" = "./props.plist" ]; then
continue
fi
mfiles="$mfiles $d"
done done
[ -n "$XBPS_COMPRESS_LEVEL" ] && clevel="-$XBPS_COMPRESS_LEVEL" [ -n "$XBPS_COMPRESS_LEVEL" ] && clevel="-$XBPS_COMPRESS_LEVEL"
@ -113,7 +117,7 @@ xbps_make_binpkg_real()
msg_normal "Building $binpkg... " msg_normal "Building $binpkg... "
${FAKEROOT_CMD} ${FAKEROOT_CMD_ARGS} \ ${FAKEROOT_CMD} ${FAKEROOT_CMD_ARGS} \
tar --exclude "var/db/xbps/metadata/*/flist" \ tar --exclude "var/db/xbps/metadata/*/flist" \
-cpf - ${mfiles} ${dirs} | \ -cpf - ${mfiles} | \
$XBPS_COMPRESS_CMD ${clevel} -qf > $pkgdir/$binpkg $XBPS_COMPRESS_CMD ${clevel} -qf > $pkgdir/$binpkg
rval=$? rval=$?
trap - INT trap - INT