From 9f16ca1852e0461f493ccfbd33792623774d6e1e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 9 May 2016 22:48:09 -0400
Subject: librechroot: Support using qemu for ARM builds on x86 via
 binfmt_misc.

---
 src/chroot-tools/arch-nspawn.patch | 61 +++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 8 deletions(-)

(limited to 'src/chroot-tools/arch-nspawn.patch')

diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch
index 6b32f2b..2b46ecb 100644
--- a/src/chroot-tools/arch-nspawn.patch
+++ b/src/chroot-tools/arch-nspawn.patch
@@ -1,5 +1,5 @@
---- arch-nspawn.in	2015-05-24 19:32:57.117177433 -0600
-+++ arch-nspawn.ugly	2015-05-24 23:40:04.031482147 -0600
+--- arch-nspawn.in	2016-05-09 18:37:11.684488405 -0400
++++ arch-nspawn.ugly	2016-05-09 22:36:00.821147136 -0400
 @@ -1,4 +1,6 @@
  #!/bin/bash
 +# License: GNU GPLv2
@@ -7,16 +7,61 @@
  # 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.
-@@ -88,10 +90,11 @@
- if [[ ! -f "$working_dir/.arch-chroot" ]]; then
- 	die "'%s' does not appear to be an Arch chroot." "$working_dir"
- elif [[ $(cat "$working_dir/.arch-chroot") != $CHROOT_VERSION ]]; then
--	die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION"
-+	die "chroot '%s' is not at version %s.  Please rebuild." "$working_dir" "$CHROOT_VERSION"
+@@ -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,9 +106,12 @@
  fi
  
  build_mount_args
 +cache_dirs+=('/repo/')
  copy_hostconf
  
++if [[ -z $nosetarch ]]; then
  eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
++fi
+ 
+ exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
+ 	-D "$working_dir" \
-- 
cgit v1.2.3-54-g00ecf