From e4a74c2b2def76b8a9f69ab0252cd150cb308e48 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 11 Apr 2019 11:03:56 -0300 Subject: [PATCH] travis/build.sh: do chroot_prepare() before building stuff --- common/travis/build.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/common/travis/build.sh b/common/travis/build.sh index c388af06841..32cefdbc739 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # build.sh @@ -9,8 +9,19 @@ 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[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 +} PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))