diff options
| author | Erich Eckner <git@eckner.net> | 2017-07-28 14:37:41 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-07-28 14:37:41 +0200 |
| commit | 5fe9355caa12d3b62d618391391b38eb7f3f6809 (patch) | |
| tree | 6a3dfe2ad84a8e21a5b3c90b2ae6fc05fe335ecf | |
| parent | 673d04702ad4336a273b539e6022b52c33543cfd (diff) | |
| download | builder-5fe9355caa12d3b62d618391391b38eb7f3f6809.tar.xz | |
bin/common-functions: take into account *_i686 variables
| -rwxr-xr-x | bin/common-functions | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/common-functions b/bin/common-functions index 6ea3702..8c7d396 100755 --- a/bin/common-functions +++ b/bin/common-functions @@ -153,7 +153,7 @@ generate_package_metadata() { sed -i '/^[^=]*=\s*$/d' "${file_prefix}.SRCINFO" # extract "groups" = groups \cup provides - grep "$(printf '^\t\\(groups\\|provides\\) = ')" "${file_prefix}.SRCINFO" | \ + grep "$(printf '^\t\\(groups\\|provides\\(_i686\\)\\?\\) = ')" "${file_prefix}.SRCINFO" | \ cut -d= -f2 | \ sed 's|^\s\+||; s|[<>]$||' | \ sort -u > \ @@ -174,8 +174,8 @@ generate_package_metadata() { # extract "depends" = makedepends \cup checkdepends \cup depends \cup \{ base, base-devel \} ( printf 'all_depend = %s\n' 'base' 'base-devel' - sed -n "$(printf '/^pkgname = /q;/^\tdepends = /p')" "${file_prefix}.SRCINFO" - grep "$(printf '^\t\\(makedepends\\|checkdepends\\) = ')" "${file_prefix}.SRCINFO" + sed -n "$(printf '/^pkgname = /q;/^\tdepends\\(_i686\\)\\? = /p')" "${file_prefix}.SRCINFO" + grep "$(printf '^\t\\(makedepends\\|checkdepends\\)\\(_i686\\)\\? = ')" "${file_prefix}.SRCINFO" ) | \ cut -d= -f2 | \ sed 's|^\s\+||; s|[<>]$||' | \ |