generate separate config file for i686 and x86_64

3 files changed, 19 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index c661fc5..0629934 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ arch-nspawn
 sogrep
 doc/*.1
 doc/*.7
+pacman-*-i686.conf
diff --git a/Makefile b/Makefile
index d888cc1..4281abc 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,13 @@ IN_PROGS = \
 BINPROGS = \
 	$(IN_PROGS)
 
+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 \
 	makepkg-x86_64_v3.conf \
@@ -40,7 +47,8 @@ CONFIGFILES = \
 	pacman-multilib-testing.conf \
 	pacman-multilib-staging.conf \
 	pacman-kde-unstable.conf \
-	pacman-gnome-unstable.conf
+	pacman-gnome-unstable.conf \
+	$(GENERATED_CONFIGFILES)
 
 SETARCH_ALIASES = \
 	x86_64_v3
@@ -97,11 +105,15 @@ MANS = \
 	doc/devtools.7
 
 
-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) "$@"
@@ -116,7 +128,7 @@ doc/%: doc/%.asciidoc
 	a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage -D doc -a pkgdatadir=$(PREFIX)/share/devtools $<
 
 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 9086684..5707eda 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -87,7 +87,9 @@ 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"