From 9c26929bb8f7279620bff5db68ee9291eef393b3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 7 Jun 2015 19:01:09 -0600 Subject: Not that it matters, but I screwed up makechrootpkg.sh:main(). --- src/chroot-tools/makechrootpkg.sh.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/chroot-tools/makechrootpkg.sh.patch b/src/chroot-tools/makechrootpkg.sh.patch index 6d5fc22..db1ca2f 100644 --- a/src/chroot-tools/makechrootpkg.sh.patch +++ b/src/chroot-tools/makechrootpkg.sh.patch @@ -1,5 +1,5 @@ ---- makechrootpkg.sh.in 2015-06-06 14:36:36.135418975 -0600 -+++ makechrootpkg.sh.ugly 2015-06-06 14:36:12.398465200 -0600 +--- makechrootpkg.sh.in 2015-06-06 14:55:45.001104732 -0600 ++++ makechrootpkg.sh.ugly 2015-06-07 19:00:01.855398639 -0600 @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 @@ -312,13 +312,12 @@ --bind-ro="$PWD:/startdir_host" \ --bind-ro="$SRCDEST:/srcdest_host" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ -- /chrootbuild "${makepkg_args[@]}" -+ /chrootprepare && ++ /chrootprepare "${makepkg_args[@]}" && + arch-nspawn "$copydir" \ + --bind-ro="$PWD:/startdir_host" \ + --bind-ro="$SRCDEST:/srcdest_host" \ + "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ -+ /chrootbuild + /chrootbuild "${makepkg_args[@]}" then - move_products + move_products "$copydir" "$src_owner" -- cgit v1.2.3-54-g00ecf