travis: some tweaks for base-chroot-v2:
- no need to perform `boostrap-update` anymore, xbps-src does it now. - don't set useless values to `etc/conf`.
This commit is contained in:
parent
e4a5beb116
commit
8b21a5a74d
2 changed files with 0 additions and 23 deletions
|
@ -6,27 +6,6 @@ if [ "$1" != "$2" ]; then
|
||||||
arch="-a $2"
|
arch="-a $2"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Tell xbps-src what is our arch, this is done when doing
|
|
||||||
# binary-bootstrap, but we need to do it every time since
|
|
||||||
# our masterdir is ethereal.
|
|
||||||
# /bin/echo -e '\x1b[32mWriting bootstrap arch into .xbps_chroot_init of masterdir\x1b[0m'
|
|
||||||
# echo "$1" > /hostrepo/masterdir/.xbps_chroot_init
|
|
||||||
|
|
||||||
/bin/echo -e '\x1b[32mPreparing chroot with chroot_prepare()\x1b[0m'
|
|
||||||
source hostrepo/common/xbps-src/shutils/chroot.sh || {
|
|
||||||
echo "Failed to source chroot.sh for chroot_prepare()" >&2 ;
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
XBPS_SRCPKGDIR=/hostrepo/srcpkgs XBPS_MASTERDIR=/ chroot_prepare $1 || {
|
|
||||||
echo "Failed to prepare chroot!" >&2 ;
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Two times due to updating xbps itself
|
|
||||||
/hostrepo/xbps-src -H "$HOME"/hostdir bootstrap-update
|
|
||||||
/hostrepo/xbps-src -H "$HOME"/hostdir bootstrap-update
|
|
||||||
|
|
||||||
PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
|
PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
|
||||||
|
|
||||||
NPROCS=1
|
NPROCS=1
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
[ "$XLINT" ] && exit 0
|
[ "$XLINT" ] && exit 0
|
||||||
|
|
||||||
/bin/echo -e '\x1b[32mUpdating etc/conf...\x1b[0m'
|
/bin/echo -e '\x1b[32mUpdating etc/conf...\x1b[0m'
|
||||||
echo XBPS_CHROOT_CMD=uchroot >> etc/conf
|
|
||||||
echo XBPS_MAKEJOBS=4 >> etc/conf
|
|
||||||
echo XBPS_ALLOW_RESTRICTED=yes >> etc/conf
|
echo XBPS_ALLOW_RESTRICTED=yes >> etc/conf
|
||||||
|
|
||||||
/bin/echo -e '\x1b[32mEnabling ethereal chroot-style...\x1b[0m'
|
/bin/echo -e '\x1b[32mEnabling ethereal chroot-style...\x1b[0m'
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue