aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Aldridge <aldridge.mac@gmail.com>2016-06-11 04:53:10 +0000
committerMichael Aldridge <aldridge.mac@gmail.com>2016-06-11 04:53:10 +0000
commit472410057a24e43080181c8b010314c8bfc4dab9 (patch)
treed125af9f3c4fa89b2d4b7dd2501f41c742a8fd5e
parentb22bc5feb83743899705027fedc58272119e0adc (diff)
downloadxbps-mini-builder-472410057a24e43080181c8b010314c8bfc4dab9.tar
xbps-mini-builder-472410057a24e43080181c8b010314c8bfc4dab9.tar.gz
xbps-mini-builder-472410057a24e43080181c8b010314c8bfc4dab9.tar.bz2
xbps-mini-builder-472410057a24e43080181c8b010314c8bfc4dab9.tar.lz
xbps-mini-builder-472410057a24e43080181c8b010314c8bfc4dab9.tar.xz
xbps-mini-builder-472410057a24e43080181c8b010314c8bfc4dab9.tar.zst
xbps-mini-builder-472410057a24e43080181c8b010314c8bfc4dab9.zip
Build packages listed
-rw-r--r--.gitignore1
-rwxr-xr-xxbps-mini-builder14
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}
+