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

xbps-src: make -B flag build binpkgs for required pkg deps.

Browse source
This commit is contained in:
Juan RP 2011-07-18 11:36:48 +02:00
parent 0b348a677c
commit e22c565811
5 changed files with 52 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xbps-src/shutils/chroot.sh.in
View file

@ -25,14 +25,16 @@
_mount()
{
MASTERDIR="${XBPS_MASTERDIR}" HOSTDIR="${XBPS_HOSTDIR}" ${sudo_cmd} \
MASTERDIR="${XBPS_MASTERDIR}" DISTRIBUTIONDIR="${XBPS_DISTRIBUTIONDIR}" \
HOSTDIR="${XBPS_HOSTDIR}" ${sudo_cmd} \
@@XBPS_INSTALL_LIBEXECDIR@@/chroot-helper mount
return $?
}
_umount()
{
MASTERDIR="${XBPS_MASTERDIR}" HOSTDIR="${XBPS_HOSTDIR}" ${sudo_cmd} \
MASTERDIR="${XBPS_MASTERDIR}" DISTRIBUTIONDIR="${XBPS_DISTRIBUTIONDIR}" \
HOSTDIR="${XBPS_HOSTDIR}" ${sudo_cmd} \
@@XBPS_INSTALL_LIBEXECDIR@@/chroot-helper umount
return $?
}
@ -231,8 +233,7 @@ create_busybox_links()
cd ${lbindir} || return 1
for f in $(${XBPS_MASTERDIR}/bin/busybox --list); do
if [ "$f" = "tar" -o "$f" = "xz" -o \
"$f" = "bzip2" -o "$f" = "gzip" -o "$f" = "sh" ]; then
if [ "$f" = "tar" -o "$f" = "sh" -o "$f" = "xz" ]; then
continue
fi
ln -s ../../../bin/busybox $f
@ -313,12 +314,13 @@ xbps_chroot_handler()
[ -n "$KEEP_WRKSRC" ] && arg="$arg -C"
[ -n "$KEEP_AUTODEPS" ] && arg="$arg -K"
[ -n "$DESTDIR_ONLY_INSTALL" ] && arg="$arg -D"
[ -n "$BUILD_BINPKG" ] && arg="$arg -B"
action="$arg $action"
env in_chroot=1 IN_CHROOT=1 LANG=C _ORIGINPKG="$pkg" \
PATH=$PATH:/usr/local/bin \
${chroot_cmd} $XBPS_MASTERDIR sh -c \
"cd /xbps/srcpkgs/$pkg && xbps-src $action" || rv=$?
"xbps-src $action $pkg" || rv=$?
fi
msg_normal "Exiting from the chroot on $XBPS_MASTERDIR.\n"