Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-04-05 15:36:00 -0400
committerJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2017-04-05 22:17:51 +0200
commit82e6bfcd7ae9a0dc2e9ef3c48d5477aa615bef9e (patch)
tree2e04064b8176e47a190055761e4c3df0881a7f10
parent35da846ddeecbdb99cd4f7a5ea13d650b1fdfda3 (diff)
mkarchroot, arch-nspawn: Add an `-f` flag to add files to copy.
This allows us to copy in files like `qemu-arm-static`, which is necessary for running an ARM chroot on an x86 box.
-rw-r--r--arch-nspawn.in12
-rw-r--r--mkarchroot.in11
2 files changed, 21 insertions, 2 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 7481d82..dceb3ed 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -15,6 +15,8 @@ m4_include(lib/archroot.sh)
working_dir=''
+files=()
+
usage() {
echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
echo "A wrapper around systemd-nspawn. Provides support for pacman."
@@ -23,15 +25,17 @@ usage() {
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 ' -h This message'
exit 1
}
-while getopts 'hC:M:c:' arg; do
+while getopts 'hC:M:c:f:' arg; do
case "$arg" in
C) pac_conf="$OPTARG" ;;
M) makepkg_conf="$OPTARG" ;;
c) cache_dir="$OPTARG" ;;
+ f) files+=("$OPTARG") ;;
h|?) usage ;;
*) error "invalid argument '%s'" "$arg"; usage ;;
esac
@@ -77,6 +81,12 @@ copy_hostconf () {
[[ -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"
}
# }}}
diff --git a/mkarchroot.in b/mkarchroot.in
index 1265335..4f35c1a 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -15,21 +15,25 @@ m4_include(lib/archroot.sh)
working_dir=''
+files=()
+
usage() {
echo "Usage: ${0##*/} [options] working-dir package-list..."
echo ' options:'
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 ' -h This message'
exit 1
}
-while getopts 'hC:M:c:' arg; do
+while getopts 'hC:M:c:f:' arg; do
case "$arg" in
C) pac_conf="$OPTARG" ;;
M) makepkg_conf="$OPTARG" ;;
c) cache_dir="$OPTARG" ;;
+ f) files+=("$OPTARG") ;;
h|?) usage ;;
*) error "invalid argument '%s'" "$arg"; usage ;;
esac
@@ -67,6 +71,11 @@ if is_btrfs "$working_dir"; then
chmod 0755 "$working_dir"
fi
+for file in "${files[@]}"; do
+ mkdir -p "$(dirname "$working_dir$file")"
+ cp "$file" "$working_dir$file"
+done
+
pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'