moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

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

Browse source 
This reverts commit fad78ea7f1.
This commit is contained in:
Juan RP 2011-11-14 20:57:18 +01:00
parent d06d7da159
commit 6ceabf90c4
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
xbps-src/shutils/make-binpkg.sh
View file

@ -59,7 +59,7 @@ binpkg_cleanup()
# #
xbps_make_binpkg_real() xbps_make_binpkg_real()
{ {
local mfiles binpkg pkgdir arch d clevel local mfiles binpkg pkgdir arch dirs _dirs 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,14 +99,10 @@ xbps_make_binpkg_real()
mfiles="./REMOVE" mfiles="./REMOVE"
fi fi
mfiles="$mfiles ./files.plist ./props.plist" mfiles="$mfiles ./files.plist ./props.plist"
for d in $(find . -type f -o -type l); do _dirs=$(find . -maxdepth 1 -type d -o -type l)
if [ "$d" = "./INSTALL" -o \ for d in ${_dirs}; do
"$d" = "./REMOVE" -o \ [ "$d" = "." ] && continue
"$d" = "./files.plist" -o \ dirs="$d $dirs"
"$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"
@ -117,7 +113,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} | \ -cpf - ${mfiles} ${dirs} | \
$XBPS_COMPRESS_CMD ${clevel} -qf > $pkgdir/$binpkg $XBPS_COMPRESS_CMD ${clevel} -qf > $pkgdir/$binpkg
rval=$? rval=$?
trap - INT trap - INT