From 660e93de85952b2e4329bd207db2ea485daf9ccc Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 1 Apr 2019 10:54:20 +0200
Subject: generate separate config file for i686 and x86_64

---
 .gitignore     |  1 +
 Makefile       | 18 +++++++++++++++---
 arch-nspawn.in |  4 +++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6a1d1e4..6fb7481 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ crossrepomove
 arch-nspawn
 sogrep
 doc/*.1
+pacman-*-i686.conf
diff --git a/Makefile b/Makefile
index a8e44ee..8ecea6f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,13 @@ BINPROGS = \
 	$(IN_PROGS) \
 	offload-build \
 
+GENERATED_CONFIGFILES = \
+	pacman-extra-i686.conf \
+	pacman-testing-i686.conf \
+	pacman-staging-i686.conf \
+	pacman-kde-unstable-i686.conf \
+	pacman-gnome-unstable-i686.conf
+
 CONFIGFILES = \
 	makepkg-x86_64.conf \
 	pacman-extra.conf \
@@ -32,7 +39,8 @@ CONFIGFILES = \
 	pacman-multilib-testing.conf \
 	pacman-multilib-staging.conf \
 	pacman-kde-unstable.conf \
-	pacman-gnome-unstable.conf
+	pacman-gnome-unstable.conf \
+	$(GENERATED_CONFIGFILES)
 
 COMMITPKG_LINKS = \
 	extrapkg \
@@ -76,11 +84,15 @@ MANS = \
 	doc/find-libprovides.1
 
 
-all: $(BINPROGS) bash_completion zsh_completion man
+all: $(GENERATED_CONFIGFILES) $(BINPROGS) bash_completion zsh_completion man
 man: $(MANS)
 
 edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
 
+pacman-%-i686.conf: pacman-%.conf
+	@echo "GEN $@"
+	@sed 's,/mirrorlist$$,\032,' "$<" > "$@"
+
 %: %.in Makefile lib/common.sh
 	@echo "GEN $@"
 	@$(RM) "$@"
@@ -95,7 +107,7 @@ doc/%: doc/%.asciidoc
 	a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage -D doc $<
 
 clean:
-	rm -f $(IN_PROGS) bash_completion zsh_completion $(MANS)
+	rm -f $(GENERATED_CONFIGFILES) $(IN_PROGS) bash_completion zsh_completion $(MANS)
 
 install:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 70fd854..b251756 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -99,7 +99,9 @@ build_mount_args() {
 copy_hostconf () {
 	unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
 	pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
-	printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
+	printf 'Server = %s\n' "${host_mirrors[@]}" | \
+		tee "$working_dir/etc/pacman.d/mirrorlist" > \
+		"$working_dir/etc/pacman.d/mirrorlist32"
 
 	[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
 	[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
-- 
cgit v1.2.3-70-g09d2