summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2018-01-02 23:38:04 -0500
committerErich Eckner <git@eckner.net>2019-04-02 11:16:20 +0200
commit51e89c98f6998b773f1f441178b5a7df3755b135 (patch)
tree5a58fabf619aa353faa0feb3f1e8e288497e5094
parent0d24b5e8a291a3f4f113b016f7a9d37ba3443fb2 (diff)
downloaddevtools32-51e89c98f6998b773f1f441178b5a7df3755b135.tar.xz
Revert "Remove i686 support"
This reverts commit 7259e7def07a5f6ee04a34db61a87361ad0b5ac7, except for commitpkg.in
-rw-r--r--.gitignore1
-rw-r--r--Makefile12
-rw-r--r--lib/valid-tags.sh19
-rw-r--r--zsh_completion.in2
4 files changed, 23 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 1bde7ff..366a99f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ crossrepomove
arch-nspawn
doc/*.1
pacman-*-i686.conf
+makepkg-i686.conf
diff --git a/Makefile b/Makefile
index 7372f6f..699060a 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ GENERATED_CONFIGFILES = \
pacman-testing-i686.conf \
pacman-staging-i686.conf \
pacman-kde-unstable-i686.conf \
- pacman-gnome-unstable-i686.conf
+ pacman-gnome-unstable-i686.conf \
+ makepkg-i686.conf
CONFIGFILES = \
makepkg-x86_64.conf \
@@ -55,13 +56,18 @@ COMMITPKG_LINKS = \
gnome-unstablepkg
ARCHBUILD_LINKS = \
+ extra-i686-build \
extra-x86_64-build \
+ testing-i686-build \
testing-x86_64-build \
+ staging-i686-build \
staging-x86_64-build \
multilib-build \
multilib-testing-build \
multilib-staging-build \
+ kde-unstable-i686-build \
kde-unstable-x86_64-build \
+ gnome-unstable-i686-build \
gnome-unstable-x86_64-build
CROSSREPOMOVE_LINKS = \
@@ -87,6 +93,10 @@ man: $(MANS)
edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g"
+makepkg-i686.conf: makepkg-x86_64.conf
+ @echo "GEN $@"
+ @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g' "$<" > "$@"
+
pacman-%-i686.conf: pacman-%.conf
@echo "GEN $@"
@sed 's,/mirrorlist$$,\032,' "$<" > "$@"
diff --git a/lib/valid-tags.sh b/lib/valid-tags.sh
index 3cfe046..2916dc7 100644
--- a/lib/valid-tags.sh
+++ b/lib/valid-tags.sh
@@ -4,22 +4,23 @@
# shellcheck disable=2034
_arch=(
+ i686
x86_64
any
)
# shellcheck disable=2034
_tags=(
- core-x86_64 core-any
- extra-x86_64 extra-any
+ core-i686 core-x86_64 core-any
+ extra-i686 extra-x86_64 extra-any
multilib-x86_64
- staging-x86_64 staging-any
- testing-x86_64 testing-any
+ staging-i686 staging-x86_64 staging-any
+ testing-i686 testing-x86_64 testing-any
multilib-testing-x86_64
multilib-staging-x86_64
- community-x86_64 community-any
- community-staging-x86_64 community-staging-any
- community-testing-x86_64 community-testing-any
- kde-unstable-x86_64 kde-unstable-any
- gnome-unstable-x86_64 gnome-unstable-any
+ community-i686 community-x86_64 community-any
+ community-staging-i686 community-staging-x86_64 community-staging-any
+ community-testing-i686 community-testing-x86_64 community-testing-any
+ kde-unstable-i686 kde-unstable-x86_64 kde-unstable-any
+ gnome-unstable-i686 gnome-unstable-x86_64 gnome-unstable-any
)
diff --git a/zsh_completion.in b/zsh_completion.in
index 45429bd..7babae5 100644
--- a/zsh_completion.in
+++ b/zsh_completion.in
@@ -1,4 +1,4 @@
-#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco
+#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-i686-build=archbuild extra-x86_64-build=archbuild testing-i686-build=archbuild testing-x86_64-build=archbuild staging-i686-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-i686-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-i686-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco
# License: Unspecified
m4_include(lib/valid-tags.sh)