diff options
-rw-r--r-- | abuild.in | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -2118,6 +2118,13 @@ checksum() { echo "sha512sums=\"$sha512sums\"" >>"$APKBUILD" } +init_root() { + mkdir -p "$1/etc/apk/keys" + cp /etc/abuild.conf /etc/group /etc/passwd "$1/etc" + cp /etc/apk/keys/* "$1/etc/apk/keys" + $SUDO_APK add --initdb --quiet --root "$1" ${2:+--arch $2} +} + rootbld_actions() { local part _check=check if options_has "checkroot"; then @@ -2158,15 +2165,11 @@ rootbld() { BUILD_ROOT=$(mktemp -d /var/tmp/abuild.XXXXXXXXXX) local aportsgit=${APORTSDIR:-${startdir}} - mkdir -p "$BUILD_ROOT/proc" "$BUILD_ROOT/etc/apk/keys" \ + mkdir -p "$BUILD_ROOT/proc" "$BUILD_ROOT/etc/apk" \ "$BUILD_ROOT/$HOME/.abuild" "$BUILD_ROOT/$aportsgit" \ "$BUILD_ROOT/$SRCDEST" "$BUILD_ROOT/$REPODEST" \ "$BUILD_ROOT/tmp/pkg" "$BUILD_ROOT/tmp/src" \ - "$BUILD_ROOT/usr/bin" "$pkgbasedir" "$REPODEST" \ - "$srcdir" - - cp /etc/abuild.conf /etc/group /etc/passwd "$BUILD_ROOT/etc" - cp /etc/apk/keys/* "$BUILD_ROOT/etc/apk/keys" + "$BUILD_ROOT/usr/bin" "$pkgbasedir" "$REPODEST" "$srcdir" if options_has "net"; then cp /etc/resolv.conf "$BUILD_ROOT/etc" @@ -2194,8 +2197,9 @@ rootbld() { echo "$REPODEST/$repo" ) < "$repo_template" > "$BUILD_ROOT/etc/apk/repositories" + init_root $BUILD_ROOT calcdeps - $SUDO_APK add --initdb --root "$BUILD_ROOT" --update \ + $SUDO_APK add --root "$BUILD_ROOT" --update \ abuild alpine-base build-base git $hostdeps $builddeps local bwrap_opts="" |