From 472410057a24e43080181c8b010314c8bfc4dab9 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 10 Jun 2016 23:53:10 -0500 Subject: Build packages listed --- .gitignore | 1 + xbps-mini-builder | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 78f0559..342fec8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ void-packages/ xbps-mini-builder.conf +packages.list diff --git a/xbps-mini-builder b/xbps-mini-builder index a6a5071..c8a55ab 100755 --- a/xbps-mini-builder +++ b/xbps-mini-builder @@ -20,19 +20,25 @@ if [ -d /etc/xbps.d ] ; then cat /etc/xbps.d/* > etc/repos-remote-x86_64.conf fi + # The bootstrap config is loaded seperately if [ -f /etc/xbps.d/00-repository-main.conf ] ; then repo="$(cat /etc/xbps.d/00-repository-main.conf | sed 's/^.*=//')" - printf 'XBPS_INSTALL_ARGS="--repository=%s --repository=%s/musl"' ${repo} ${repo} > etc/conf + printf 'XBPS_INSTALL_ARGS="--repository=%s --repository=%s/musl"\n' ${repo} ${repo} > etc/conf fi fi # Do we have a live build environment if [ ! -d masterdir ] ; then # No masterdir, go ahead and bootstrap it - ./xbps-src binary-bootstrap ${builder_arch:=$(xbps-uhelper arch)} + ./xbps-src binary-bootstrap fi # Apply provided config file if it exists -if [ -f xbps-mini-builder.conf ] ; then - cat xbps-mini-builder.conf >> etc/conf +if [ -f ../xbps-mini-builder.conf ] ; then + cat ../xbps-mini-builder.conf >> etc/conf fi + +# Main builder section +packages="$(cat ../packages.list)" +xbulk ${packages} + -- cgit v1.2.3