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

Use the new xbps-uhelper bin, require xbps utils 20091124-1.

Browse source 
--HG--
extra : convert_revision : d29be962c344de65b805f4690afc335db32b541e
This commit is contained in:
Juan RP 2009-11-24 12:21:49 +00:00
parent 6a228e3706
commit c6f4aa322b
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
xbps-src/shutils/chroot.sh
View file

@ -123,10 +123,10 @@ create_busybox_links()
install_xbps_utils() install_xbps_utils()
{ {
local needed fetch_cmd local needed _cmd
local xbps_prefix=$XBPS_MASTERDIR/usr/local local xbps_prefix=$XBPS_MASTERDIR/usr/local
for f in bin cmpver digest pkgdb; do for f in bin repo uhelper; do
if [ ! -x $xbps_prefix/sbin/xbps-${f}.static ]; then if [ ! -x $xbps_prefix/sbin/xbps-${f}.static ]; then
needed=yes needed=yes
fi fi
@ -136,17 +136,11 @@ install_xbps_utils()
echo "=> Installing the required XBPS utils." echo "=> Installing the required XBPS utils."
chroot $XBPS_MASTERDIR sh -c \ chroot $XBPS_MASTERDIR sh -c \
"echo /usr/local/lib > /etc/ld.so.conf" "echo /usr/local/lib > /etc/ld.so.conf"
fetch_cmd="$(which $XBPS_FETCH_CMD 2>/dev/null)" for f in bin repo uhelper; do
if [ -z "$fetch_cmd" ]; then _cmd=$(which xbps-${f}.static 2>/dev/null)
echo "Unexistent XBPS_FETCH_CMD specified!" if [ -z "${_cmd}" ]; then
exit 1 echo "Unexistent xbps-uhelper.static file!"
fi exit 1
cp -f $fetch_cmd $xbps_prefix/sbin
for f in bin cmpver digest pkgdb repo; do
_cmd="$(which xbps-${f}.static 2>/dev/null)"
if [ -z "$_cmd" ]; then
echo "Unexisting xbps-${f}.static bin!"
exit 1
fi fi
cp -f ${_cmd} $xbps_prefix/sbin cp -f ${_cmd} $xbps_prefix/sbin
done done
@ -299,7 +293,7 @@ echo "XBPS_BUILDDIR=/xbps_builddir" >> $XBPSSRC_CF
echo "XBPS_SRCDISTDIR=/xbps_srcdistdir" >> $XBPSSRC_CF echo "XBPS_SRCDISTDIR=/xbps_srcdistdir" >> $XBPSSRC_CF
echo "XBPS_CFLAGS=\"$XBPS_CFLAGS\"" >> $XBPSSRC_CF echo "XBPS_CFLAGS=\"$XBPS_CFLAGS\"" >> $XBPSSRC_CF
echo "XBPS_CXXFLAGS=\"\$XBPS_CFLAGS\"" >> $XBPSSRC_CF echo "XBPS_CXXFLAGS=\"\$XBPS_CFLAGS\"" >> $XBPSSRC_CF
echo "XBPS_FETCH_CMD=$XBPS_FETCH_CMD" >> $XBPSSRC_CF echo "XBPS_FETCH_CMD='xbps-uhelper.static fetch'" >> $XBPSSRC_CF
if [ -n "$XBPS_MAKEJOBS" ]; then if [ -n "$XBPS_MAKEJOBS" ]; then
echo "XBPS_MAKEJOBS=$XBPS_MAKEJOBS" >> $XBPSSRC_CF echo "XBPS_MAKEJOBS=$XBPS_MAKEJOBS" >> $XBPSSRC_CF
fi fi

10
xbps-src/xbps-src.sh.in
View file

@ -30,7 +30,7 @@ trap "echo && exit 1" INT QUIT
: ${progname:=$(basename $0)} : ${progname:=$(basename $0)}
: ${fakeroot_cmd:=fakeroot} : ${fakeroot_cmd:=fakeroot}
: ${xbps_machine:=$(uname -m)} : ${xbps_machine:=$(uname -m)}
: ${XBPS_UTILS_REQVER:=20091123} : ${XBPS_UTILS_REQVER:=20091124-1}
usage() usage()
{ {
@ -116,11 +116,11 @@ set_defvars()
[ ! -d "$val" ] && msg_error "cannot find $i, aborting." [ ! -d "$val" ] && msg_error "cannot find $i, aborting."
done done
export XBPS_PKGDB_CMD="xbps-pkgdb.static -r $XBPS_MASTERDIR" export XBPS_PKGDB_CMD="xbps-uhelper.static -r $XBPS_MASTERDIR"
export XBPS_BIN_CMD="xbps-bin.static -r $XBPS_MASTERDIR" export XBPS_BIN_CMD="xbps-bin.static -r $XBPS_MASTERDIR"
export XBPS_DIGEST_CMD="xbps-digest.static" export XBPS_DIGEST_CMD="xbps-uhelper.static digest"
export XBPS_CMPVER_CMD="xbps-cmpver.static" export XBPS_CMPVER_CMD="xbps-uhelper.static cmpver"
export XBPS_FETCH_CMD="xbps-fetch.static" export XBPS_FETCH_CMD="xbps-uhelper.static fetch"
# #
# Check that installed xbps utils version is recent enough. # Check that installed xbps utils version is recent enough.