summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2018-08-03 12:27:39 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2018-08-03 12:27:39 -0400
commitb1773440be67eb9a5ac157c64d2d357bb1163f53 (patch)
tree31c397141c39d4f15cc6ef2d41472f1900e5d4c0
parentfdf7ec7616e06870c7c30205578e98b43aa34482 (diff)
Revert "makechrootpkg: _chrootbuild: Split into _chroot{prepare,build}"
This reverts commit ad54ac08ae475134f1ef6242cf4a831aa4ab770a.
-rw-r--r--makechrootpkg.in27
1 files changed, 1 insertions, 26 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 4cfc6b4..183e688 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -213,12 +213,6 @@ Server = file:///repo
# working copy
{
printf '#!/bin/bash\n'
- declare -f _chrootprepare
- printf '_chrootprepare "$@"\n'
- } > "$copydir/chrootprepare"
- chmod +x "$copydir/chrootprepare"
- {
- printf '#!/bin/bash\n'
declare -f _chrootbuild
declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
printf '_chrootbuild "$@" || exit\n'
@@ -233,20 +227,6 @@ Server = file:///repo
# These functions aren't run in makechrootpkg,
# so no global variables
-_chrootprepare() {
- # No coredumps
- ulimit -c 0
-
- # shellcheck source=/dev/null
- . /etc/profile
-
- # Beware, there are some stupid arbitrary rules on how you can
- # use "$" in arguments to commands with "sudo -i". ${foo} or
- # ${1} is OK, but $foo or $1 isn't.
- # https://bugzilla.sudo.ws/show_bug.cgi?id=765
- sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@" --nobuild' -bash "$@"
-}
-
_chrootbuild() {
# No coredumps
ulimit -c 0
@@ -273,7 +253,7 @@ _chrootbuild() {
# ${1} is OK, but $foo or $1 isn't.
# https://bugzilla.sudo.ws/show_bug.cgi?id=765
sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; SRCEXT="${1}" makepkg "${@:2}" --allsource' -bash "$srcext" "$@" || return
- sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@" --noextract --noprepare' -bash "$@"
+ sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
}
_chrootnamcap() {
@@ -460,11 +440,6 @@ main() {
--bind="$PWD:/startdir" \
--bind="$SRCDEST:/srcdest" \
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
- /chrootprepare "${makepkg_args[@]}" &&
- arch-nspawn "$copydir" \
- --bind="$PWD:/startdir" \
- --bind="$SRCDEST:/srcdest" \
- "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
/chrootbuild "${makepkg_args[@]}"
then
move_products "$copydir" "$src_owner"