oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: rootbld: make mkusers work

Browse Source
This commit is contained in:
Kaarle Ritvanen 2017-07-06 17:41:37 +03:00
parent ee52fee11c
commit cf18bf6ed9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
abuild.in
View File

@ -2023,6 +2023,8 @@ rootbld() {
msg "Preparing build chroot..." msg "Preparing build chroot..."
mkusers
BUILD_ROOT=$(mktemp -d /var/tmp/abuild.XXXXXXXXXX) BUILD_ROOT=$(mktemp -d /var/tmp/abuild.XXXXXXXXXX)
local aportsgit=${APORTSDIR:-${startdir}} local aportsgit=${APORTSDIR:-${startdir}}
@ -2033,7 +2035,7 @@ rootbld() {
"$BUILD_ROOT/usr/bin" "$pkgbasedir" "$REPODEST" \ "$BUILD_ROOT/usr/bin" "$pkgbasedir" "$REPODEST" \
"$srcdir" "$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" cp /etc/apk/keys/* "$BUILD_ROOT/etc/apk/keys"
local repo_template=$aportsgit/$repo/.rootbld-repositories local repo_template=$aportsgit/$repo/.rootbld-repositories
@ -2080,7 +2082,7 @@ rootbld() {
--hostname "build-edge-$CARCH" \ --hostname "build-edge-$CARCH" \
--chdir "$startdir" \ --chdir "$startdir" \
--setenv PATH /bin:/usr/bin:/sbin:/usr/sbin \ --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 update_abuildrepo_index
cleanup $CLEANUP cleanup $CLEANUP
} }