summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-07-18 15:11:52 +0200
committerErich Eckner <git@eckner.net>2017-07-18 15:11:52 +0200
commit23507ddc597632a25c846439c9adb2abb12ea59f (patch)
tree040d840af223c0d0d8049adaa0daf7a9438742e0 /bin
parent1038c3ce4412e0a8fd8c160afdbcdcbfd3e95f87 (diff)
downloadbuilder-23507ddc597632a25c846439c9adb2abb12ea59f.tar.xz
include i686 (again?) in arch list
Diffstat (limited to 'bin')
-rwxr-xr-xbin/build-packages1
-rwxr-xr-xbin/common-functions12
2 files changed, 9 insertions, 4 deletions
diff --git a/bin/build-packages b/bin/build-packages
index 441e43c..c0c5266 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -159,6 +159,7 @@ while [ ${count} -ne 0 ]; do
git -C "${repo_paths__archlinux32}" archive "${mod_git_revision}" -- "${PKGBUILD_mod}" | \
tar -Ox "${PKGBUILD_mod}" >> \
"${tmp_dir}/PKGBUILD"
+ append_architectures "${tmp_dir}/PKGBUILD"
fi
cd "${tmp_dir}"
diff --git a/bin/common-functions b/bin/common-functions
index f927386..5f124d3 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -2,10 +2,6 @@
# contains functions used by more than one script
-# TODO:
-
-# mangle $arch in PKBUILDs to contain i486, i586, i686
-
# find_pkgbuilds package repository git_repository git_revision mod_git_revision
# find the PKGBUILD and modification of $package from $repository
# sets $PKGBUILD and $PKGBUILD_mod
@@ -481,3 +477,11 @@ insert_break_loops_orders() {
) | \
sponge "${file}"
}
+
+# append_architectures $PKGBUILD
+# mangle $arch in PKBUILDs to contain i486, i586, i686
+
+append_architectures() {
+ local PKGBUILD="$1"
+ sed -i '/^arch=(/s/(/(i686 /'
+}