This patchset contains multiple changes to xbps-src and its required package "base-chroot" for building packages via chroot. - moved xbps.d(5) conf files to `etc/xbps.d`. - renamed xbps.d(5) repository files to `etc/xbps.d/repos-{local,remote}*`. - do not set `--repository` to any xbps command that supports it, xbps-src now simply populates `rootdir/etc/xbps.d` with correct settings (taking care of CHROOT_READY/IN_CHROOT). - Unless `-C` is set (to preserve builddir/destdir/autodeps), when entering to the chroot (if CHROOT_READY is set), xbps-src will clean up the masterdir and then perform a system update to always use a constant set of packages for that exact date. - Improved some normal/error msgs. - Includes support for `xbps>=0.58`. - common/hooks: switch to bsdtar. - base-chroot: - base-chroot-musl is gone, now unified for glibc/musl. - deps removed: gettext, mpfr, readline, texinfo, which, xz. - deps changed: tar -> bsdtar. Effectively this reduces dependencies in `base-chroot`, makes it unified for musl and glibc, switches xbps-src to use `bsdtar` rather than GNU `tar` and `xz`, gets rid of useless host dependencies like GNU gettext, texinfo, etc. I've been testing these changes for 1 month or so already, I was able to build from scratch `base-system` for both native and multiple targets, i.e `./xbps-src -a target -Nt pkg base-system`
120 lines
3.2 KiB
Bash
120 lines
3.2 KiB
Bash
# vim: set ts=4 sw=4 et:
|
|
|
|
bulk_getlink() {
|
|
local p="${1##*/}"
|
|
local target="$(readlink $XBPS_SRCPKGDIR/$p)"
|
|
|
|
if [ $? -eq 0 -a -n "$target" ]; then
|
|
p=$target
|
|
fi
|
|
echo $p
|
|
}
|
|
|
|
bulk_sortdeps() {
|
|
local _pkgs _pkg pkgs pkg found f x tmpf
|
|
|
|
_pkgs="$@"
|
|
# Iterate over the list and make sure that only real pkgs are
|
|
# added to our pkglist.
|
|
for pkg in ${_pkgs}; do
|
|
found=0
|
|
f=$(bulk_getlink $pkg)
|
|
for x in ${pkgs}; do
|
|
if [ "$x" = "${f}" ]; then
|
|
found=1
|
|
break
|
|
fi
|
|
done
|
|
if [ $found -eq 0 ]; then
|
|
pkgs+="${f} "
|
|
fi
|
|
done
|
|
|
|
tmpf=$(mktemp) || exit 1
|
|
# Now make the real dependency graph of all pkgs to build.
|
|
# Perform a topological sort of all pkgs but only with build dependencies
|
|
# that are found in previous step.
|
|
for pkg in ${pkgs}; do
|
|
_pkgs="$($XBPS_DISTDIR/xbps-src show-build-deps $pkg 2>/dev/null)"
|
|
found=0
|
|
for x in ${_pkgs}; do
|
|
_pkg=$(bulk_getlink $x)
|
|
for f in ${pkgs}; do
|
|
if [ "${f}" != "${_pkg}" ]; then
|
|
continue
|
|
fi
|
|
found=1
|
|
echo "${pkg} ${f}" >> $tmpf
|
|
done
|
|
done
|
|
[ $found -eq 0 ] && echo "${pkg} ${pkg}" >> $tmpf
|
|
done
|
|
tsort $tmpf|tac
|
|
rm -f $tmpf
|
|
}
|
|
|
|
bulk_build() {
|
|
local sys="$1"
|
|
local NPROCS=$(($(nproc)*2))
|
|
local NRUNNING=0
|
|
|
|
if [ "$XBPS_CROSS_BUILD" ]; then
|
|
source ${XBPS_COMMONDIR}/cross-profiles/${XBPS_CROSS_BUILD}.sh
|
|
export XBPS_ARCH=${XBPS_TARGET_MACHINE}
|
|
fi
|
|
if ! command -v xbps-checkvers &>/dev/null; then
|
|
msg_error "xbps-src: cannot find xbps-checkvers(1) command!\n"
|
|
fi
|
|
|
|
# Compare installed pkg versions vs srcpkgs
|
|
if [[ $sys ]]; then
|
|
xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR
|
|
return $?
|
|
fi
|
|
# compare repo pkg versions vs srcpkgs
|
|
for f in $(xbps-checkvers -f '%n' -D $XBPS_DISTDIR); do
|
|
if [ $NRUNNING -eq $NPROCS ]; then
|
|
NRUNNING=0
|
|
wait
|
|
fi
|
|
NRUNNING=$((NRUNNING+1))
|
|
(
|
|
setup_pkg $f $XBPS_TARGET_MACHINE &>/dev/null
|
|
if show_avail &>/dev/null; then
|
|
echo "$f"
|
|
fi
|
|
) &
|
|
done
|
|
wait
|
|
return $?
|
|
}
|
|
|
|
bulk_update() {
|
|
local args="$1" pkgs f rval
|
|
|
|
pkgs="$(bulk_build ${args})"
|
|
[[ -z $pkgs ]] && return 0
|
|
|
|
msg_normal "xbps-src: the following packages must be rebuilt and updated:\n"
|
|
for f in ${pkgs}; do
|
|
echo " $f"
|
|
done
|
|
for f in ${pkgs}; do
|
|
XBPS_TARGET_PKG=$f
|
|
read_pkg
|
|
msg_normal "xbps-src: building ${pkgver} ...\n"
|
|
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
|
|
chroot_handler pkg $XBPS_TARGET_PKG
|
|
else
|
|
$XBPS_LIBEXECDIR/build.sh $f $f pkg $XBPS_CROSS_BUILD
|
|
fi
|
|
if [ $? -eq 1 ]; then
|
|
msg_error "xbps-src: failed to build $pkgver pkg!\n"
|
|
fi
|
|
done
|
|
if [ -n "$pkgs" -a -n "$args" ]; then
|
|
echo
|
|
msg_normal "xbps-src: updating your system, confirm to proceed...\n"
|
|
${XBPS_SUCMD} "$XBPS_INSTALL_CMD $XBPS_INSTALL_ARGS -u ${pkgs}" || return 1
|
|
fi
|
|
}
|