From 1a4d8f99217281c17624d6726f9f0249616b6bbe Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 18 May 2017 12:39:41 +0200
Subject: build for i686 (instead of i486) for now

---
 bin/build-packages    |  2 +-
 bin/common-functions  |  4 ++--
 bin/return-assignment | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'bin')

diff --git a/bin/build-packages b/bin/build-packages
index 413aacf..3b365c4 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -107,7 +107,7 @@ while [ ${count} -ne 0 ]; do
       success=false
       for parameters in '' '-c'; do
         rm -f *.pkg.tar.xz{,.sig}
-        if staging-i486-build ${parameters}; then
+        if staging-i686-build ${parameters}; then
         # build successful
           ls -1 *.pkg.tar.xz | \
             xargs -rn1 gpg --local-user="${package_key}" --detach-sign
diff --git a/bin/common-functions b/bin/common-functions
index 7ebe5fc..565ae85 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -56,8 +56,8 @@ apply_package_customizations() {
   fi
 
   if [ ! -f 'PKGBUILD.changes-applied' ]; then
-    # add i486 to the arch list
-    sed '/^arch=[^#]*any/!s|^\(arch=(\)\([^#]*)\)\s*\(#.*\)\?$|\1i486 \2|' -i 'PKGBUILD'
+    # add i686 to the arch list
+    sed '/^arch=[^#]*any/!s|^\(arch=(\)\([^#]*)\)\s*\(#.*\)\?$|\1'"'i686'"' \2|' -i 'PKGBUILD'
     if [ -f "${repo_paths["archlinux32"]}/$2/$1/PKGBUILD" ]; then
       # If this package has modifications (or is new), apply them now:
       # append PKGBUILD
diff --git a/bin/return-assignment b/bin/return-assignment
index f56a908..0f000f3 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -105,9 +105,9 @@ package_errors="$(
       tr ' ' '\n' | \
       sed '
         s@\(-[^-]\+\)\{2\}-\([^-]\+\)\.pkg\.tar\.xz@ \2@
-        / any$/{s|any$|i486|}
+        / any$/{s|any$|i686|}
       '
-    sed 's|$| i486|' "${work_dir}/package-infos/$1.$2.$3.packages"
+    sed 's|$| i686|' "${work_dir}/package-infos/$1.$2.$3.packages"
   ) | \
     sort | \
     uniq -u
@@ -120,11 +120,11 @@ if [ -n "${package_errors}" ]; then
 fi
 
 # move packages
-mkdir -p "${master_mirror_directory}/i486/$4-staging/"
-mv *.pkg.tar.xz{,.sig} "${master_mirror_directory}/i486/$4-staging/"
+mkdir -p "${master_mirror_directory}/i686/$4-staging/"
+mv *.pkg.tar.xz{,.sig} "${master_mirror_directory}/i686/$4-staging/"
 
 (
-  cd "${master_mirror_directory}/i486/$4-staging"
+  cd "${master_mirror_directory}/i686/$4-staging"
   repo-add "$4-staging.db.tar.gz" "${packages[@]}"
   # repo-add -v -s -k "${repo_key}" "$4-staging.db.tar.gz" "${packages[@]}"
 )
-- 
cgit v1.2.3-54-g00ecf