From 0fe31dd8395c5b6769839c60a11d135ecc408270 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 22 Jun 2017 11:00:15 +0200 Subject: introduce i486 as well --- .gitignore | 2 ++ Makefile | 29 ++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6b7a40b..f02925f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,7 @@ crossrepomove arch-nspawn sogrep doc/*.1 +pacman-*-i486.conf pacman-*-i686.conf +makepkg-i486.conf makepkg-i686.conf diff --git a/Makefile b/Makefile index bb8b5a9..c2bf1e7 100644 --- a/Makefile +++ b/Makefile @@ -25,12 +25,19 @@ BINPROGS = \ $(IN_PROGS) GENERATED_CONFIGFILES = \ + pacman-extra-i486.conf \ pacman-extra-i686.conf \ + pacman-testing-i486.conf \ pacman-testing-i686.conf \ + pacman-staging-i486.conf \ pacman-staging-i686.conf \ + pacman-staging-with-build-support-i486.conf \ pacman-staging-with-build-support-i686.conf \ + pacman-kde-unstable-i486.conf \ pacman-kde-unstable-i686.conf \ + pacman-gnome-unstable-i486.conf \ pacman-gnome-unstable-i686.conf \ + makepkg-i486.conf \ makepkg-i686.conf CONFIGFILES = \ @@ -59,18 +66,24 @@ COMMITPKG_LINKS = \ gnome-unstablepkg ARCHBUILD_LINKS = \ + extra-i486-build \ extra-i686-build \ extra-x86_64-build \ + testing-i486-build \ testing-i686-build \ testing-x86_64-build \ + staging-i486-build \ staging-i686-build \ staging-x86_64-build \ + staging-with-build-support-i486-build \ staging-with-build-support-i686-build \ multilib-build \ multilib-testing-build \ multilib-staging-build \ + kde-unstable-i486-build \ kde-unstable-i686-build \ kde-unstable-x86_64-build \ + gnome-unstable-i486-build \ gnome-unstable-i686-build \ gnome-unstable-x86_64-build @@ -99,13 +112,27 @@ man: $(MANS) edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g" +makepkg-i486.conf: makepkg-x86_64.conf + @echo "GEN $@" + @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i486\2,g' "$<" > "$@" + makepkg-i686.conf: makepkg-x86_64.conf @echo "GEN $@" @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g' "$<" > "$@" +pacman-%-i486.conf: pacman-%.conf + @echo "GEN $@" + @sed " \ + s,/mirrorlist\$$,\032,; \ + /^Architecture = / s/^.*\$$/Architecture = i486/; \ + " "$<" > "$@" + pacman-%-i686.conf: pacman-%.conf @echo "GEN $@" - @sed 's,/mirrorlist$$,\032,' "$<" > "$@" + @sed " \ + s,/mirrorlist\$$,\032,; \ + /^Architecture = / s/^.*$$/Architecture = i686/ \ + " "$<" > "$@" %: %.in Makefile lib/common.sh @echo "GEN $@" -- cgit v1.2.3-70-g09d2