From 23507ddc597632a25c846439c9adb2abb12ea59f Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 18 Jul 2017 15:11:52 +0200 Subject: include i686 (again?) in arch list --- bin/build-packages | 1 + bin/common-functions | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'bin') 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 /' +} -- cgit v1.2.3-70-g09d2