summaryrefslogtreecommitdiff
path: root/src/chroot-tools/arch-nspawn.patch
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-02-15 18:55:25 -0500
committerLuke Shumaker <lukeshu@lukeshu.com>2017-04-11 13:02:27 -0400
commit74067d389c204cd40906980391680724380667c0 (patch)
tree654f7aaed07e8fe019893337256929db87a017a1 /src/chroot-tools/arch-nspawn.patch
parent2e798795833af72ba0618f5577f15488b201b0fa (diff)
Expect devtools files to already be patched.
Diffstat (limited to 'src/chroot-tools/arch-nspawn.patch')
-rw-r--r--src/chroot-tools/arch-nspawn.patch71
1 files changed, 0 insertions, 71 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch
deleted file mode 100644
index dc4cb25..0000000
--- a/src/chroot-tools/arch-nspawn.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- arch-nspawn.in 2016-05-10 13:48:14.303797115 -0400
-+++ arch-nspawn.ugly 2016-05-10 13:48:23.296957958 -0400
-@@ -1,4 +1,6 @@
- #!/bin/bash
-+# License: GNU GPLv2
-+#
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; version 2 of the License.
-@@ -14,6 +16,8 @@
-
- working_dir=''
-
-+files=()
-+
- usage() {
- echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
- echo "A wrapper around systemd-nspawn. Provides support for pacman."
-@@ -22,17 +26,21 @@
- echo ' -C <file> Location of a pacman config file'
- echo ' -M <file> Location of a makepkg config file'
- echo ' -c <dir> Set pacman cache'
-+ echo ' -f <file> Copy file from the host to the chroot'
-+ echo ' -s Do not run setarch'
- echo ' -h This message'
- exit 1
- }
-
- orig_argv=("$@")
-
--while getopts 'hC:M:c:' arg; do
-+while getopts 'hC:M:c:f:s' arg; do
- case "$arg" in
- C) pac_conf="$OPTARG" ;;
- M) makepkg_conf="$OPTARG" ;;
- c) cache_dir="$OPTARG" ;;
-+ f) files+=("$OPTARG") ;;
-+ s) nosetarch=1 ;;
- h|?) usage ;;
- *) error "invalid argument '%s'" "$arg"; usage ;;
- esac
-@@ -78,6 +86,12 @@
- [[ -n $pac_conf ]] && cp $pac_conf "$working_dir/etc/pacman.conf"
- [[ -n $makepkg_conf ]] && cp $makepkg_conf "$working_dir/etc/makepkg.conf"
-
-+ local file
-+ for file in "${files[@]}"; do
-+ mkdir -p "$(dirname "$working_dir$file")"
-+ cp -T "$file" "$working_dir$file"
-+ done
-+
- sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$working_dir/etc/pacman.conf"
- }
- # }}}
-@@ -92,6 +106,7 @@
- fi
-
- build_mount_args
-+cache_dirs+=('/repo/')
- copy_hostconf
-
- eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
-@@ -99,6 +114,8 @@
- armv7h) CARCH=armv7l;;
- esac
-
-+[[ -z $nosetarch ]] || unset CARCH
-+
- exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
- -D "$working_dir" \
- --register=no \