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

xbps-src: drop fakeroot; xbps-create(8) is our friend.

Browse source 
- This should work for almost 90% current packages, as reported by OpenBSD/ports.
- Packages that use install -o <user> -g <group>  will get fixed progressively.
- xbps-create(8) by default sets pkg files as 0:0, if any pkg needs special
  permissions those can be set via INSTALL scripts (for now).
This commit is contained in:
Juan RP 2014-09-24 19:51:17 +02:00
parent b157085af7
commit 1ce278f035
5 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/xbps-src/shutils/pkgtarget.sh
View file

@ -60,13 +60,13 @@ install_pkg() {
[ "$target" = "build" ] && return 0
# Install pkgs into destdir.
$FAKEROOT_CMD $XBPS_LIBEXECDIR/xbps-src-doinstall.sh $sourcepkg $cross || exit 1
$XBPS_LIBEXECDIR/xbps-src-doinstall.sh $sourcepkg $cross || exit 1
for subpkg in ${subpackages} ${sourcepkg}; do
$FAKEROOT_CMD $XBPS_LIBEXECDIR/xbps-src-doinstall.sh $subpkg $cross || exit 1
$XBPS_LIBEXECDIR/xbps-src-doinstall.sh $subpkg $cross || exit 1
done
for subpkg in ${subpackages} ${sourcepkg}; do
$FAKEROOT_CMD $XBPS_LIBEXECDIR/xbps-src-prepkg.sh $subpkg $cross || exit 1
$XBPS_LIBEXECDIR/xbps-src-prepkg.sh $subpkg $cross || exit 1
done
if [ "$XBPS_TARGET_PKG" = "$sourcepkg" ]; then
@ -75,7 +75,7 @@ install_pkg() {
# If install went ok generate the binpkgs.
for subpkg in ${subpackages} ${sourcepkg}; do
$FAKEROOT_CMD $XBPS_LIBEXECDIR/xbps-src-dopkg.sh $subpkg "$XBPS_REPOSITORY" "$cross" || exit 1
$XBPS_LIBEXECDIR/xbps-src-dopkg.sh $subpkg "$XBPS_REPOSITORY" "$cross" || exit 1
done
# pkg cleanup
@ -126,12 +126,12 @@ remove_pkg_autodeps() {
tmplogf=$(mktemp)
if [ -z "$CHROOT_READY" ]; then
$FAKEROOT_CMD xbps-reconfigure -r $XBPS_MASTERDIR -a >> $tmplogf 2>&1
$FAKEROOT_CMD xbps-remove -r $XBPS_MASTERDIR -Ryo >> $tmplogf 2>&1
xbps-reconfigure -r $XBPS_MASTERDIR -a >> $tmplogf 2>&1
xbps-remove -r $XBPS_MASTERDIR -Ryo >> $tmplogf 2>&1
else
remove_pkg_cross_deps
$FAKEROOT_CMD xbps-reconfigure -a >> $tmplogf 2>&1
$FAKEROOT_CMD xbps-remove -Ryo >> $tmplogf 2>&1
xbps-reconfigure -a >> $tmplogf 2>&1
xbps-remove -Ryo >> $tmplogf 2>&1
fi
if [ $? -ne 0 ]; then