diff options
Diffstat (limited to 'nonsystemd/devtools/nonsystemd.patch')
| -rw-r--r-- | nonsystemd/devtools/nonsystemd.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/nonsystemd/devtools/nonsystemd.patch b/nonsystemd/devtools/nonsystemd.patch new file mode 100644 index 000000000..ff93aa9f4 --- /dev/null +++ b/nonsystemd/devtools/nonsystemd.patch @@ -0,0 +1,43 @@ +diff --git a/arch-nspawn.in b/arch-nspawn.in +index cde1f60..03dc29c 100644 +--- a/arch-nspawn.in ++++ b/arch-nspawn.in +@@ -23,8 +23,8 @@ files=() + mount_args=() + + usage() { +- echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]" +- echo "A wrapper around systemd-nspawn. Provides support for pacman." ++ echo "Usage: ${0##*/} [options] working-dir [chroot-nspawn arguments]" ++ echo "A wrapper around chroot-nspawn. Provides support for pacman." + echo + echo ' options:' + echo ' -C <file> Location of a pacman config file' +@@ -124,10 +124,13 @@ fi + copy_hostconf + + eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" ++case "$CARCH" in ++ armv7h) CARCH=armv7l;; ++esac + + [[ -z $nosetarch ]] || unset CARCH + +-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ ++exec ${CARCH:+setarch "$CARCH"} chroot-nspawn -q \ + -D "$working_dir" \ + -E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \ + --register=no --keep-unit --as-pid2 \ +diff --git a/mkarchroot.in b/mkarchroot.in +index 37f6802..d20a859 100644 +--- a/mkarchroot.in ++++ b/mkarchroot.in +@@ -97,8 +97,6 @@ printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" + echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf" + echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" + +-systemd-machine-id-setup --root="$working_dir" +- + exec arch-nspawn \ + "${nspawn_args[@]}" \ + "$working_dir" locale-gen |