From cf18bf6ed98715be16e9c335c8113b208ca29776 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Thu, 6 Jul 2017 17:41:37 +0300 Subject: abuild: rootbld: make mkusers work --- abuild.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'abuild.in') diff --git a/abuild.in b/abuild.in index 7b89aaa..7cd2525 100644 --- a/abuild.in +++ b/abuild.in @@ -2023,6 +2023,8 @@ rootbld() { msg "Preparing build chroot..." + mkusers + BUILD_ROOT=$(mktemp -d /var/tmp/abuild.XXXXXXXXXX) local aportsgit=${APORTSDIR:-${startdir}} @@ -2033,7 +2035,7 @@ rootbld() { "$BUILD_ROOT/usr/bin" "$pkgbasedir" "$REPODEST" \ "$srcdir" - cp /etc/abuild.conf "$BUILD_ROOT/etc" + cp /etc/abuild.conf /etc/group /etc/passwd "$BUILD_ROOT/etc" cp /etc/apk/keys/* "$BUILD_ROOT/etc/apk/keys" local repo_template=$aportsgit/$repo/.rootbld-repositories @@ -2080,7 +2082,7 @@ rootbld() { --hostname "build-edge-$CARCH" \ --chdir "$startdir" \ --setenv PATH /bin:/usr/bin:/sbin:/usr/sbin \ - /usr/bin/abuild $force symlinksrc unpack prepare mkusers build rootpkg + /usr/bin/abuild $force symlinksrc unpack prepare build rootpkg update_abuildrepo_index cleanup $CLEANUP } -- cgit v1.2.3-60-g2f50