Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-01 10:54:20 +0200
committerErich Eckner <git@eckner.net>2020-05-18 08:45:01 +0200
commit3e3af0c26dd10d2e1bd703514755acdd3133f554 (patch)
treeb10970eacfad9ef5610284444debf41e9e69e9c2
parentf2e34f51c071dd80c32e2c6fdb94242b12253318 (diff)
generate separate config file for i686 and x86_64
-rw-r--r--.gitignore1
-rw-r--r--Makefile18
-rw-r--r--arch-nspawn.in4
3 files changed, 19 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 1e620da..4a43461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ crossrepomove
arch-nspawn
sogrep
doc/*.1
+pacman-*-i686.conf
diff --git a/Makefile b/Makefile
index 6a608cc..10a9af0 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,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 \
pacman-extra.conf \
@@ -33,7 +40,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 = \
@@ -80,11 +88,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) "$@"
@@ -99,7 +111,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 b1021a4..03abcd8 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -97,7 +97,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"