diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2017-07-06 17:41:37 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2017-07-06 17:45:20 +0300 |
| commit | cf18bf6ed98715be16e9c335c8113b208ca29776 (patch) | |
| tree | 6761053f00ff88d3ec7ba6762711afe6b4b2425f | |
| parent | ee52fee11ce09abf3b070cbfb3697646c24f51e5 (diff) | |
| download | abuild-cf18bf6ed98715be16e9c335c8113b208ca29776.tar.gz abuild-cf18bf6ed98715be16e9c335c8113b208ca29776.tar.bz2 abuild-cf18bf6ed98715be16e9c335c8113b208ca29776.tar.xz abuild-cf18bf6ed98715be16e9c335c8113b208ca29776.zip | |
abuild: rootbld: make mkusers work
| -rw-r--r-- | abuild.in | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 } |