summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-07-19 16:55:50 +0200
committerErich Eckner <git@eckner.net>2017-07-19 16:55:50 +0200
commitb619cadeda1b066cec1eeb12a5edea93f8a3dc96 (patch)
tree8339e7ccdae93503c304d4524404ea69ded6295f
parent9bb8c8c27226b98b773bb233eaab9dd2ba17bb94 (diff)
downloadbuilder-b619cadeda1b066cec1eeb12a5edea93f8a3dc96.tar.xz
bin/common-functions: generate_package_metadata: include all groups in "builds", include provides in "groups"
-rwxr-xr-xbin/common-functions8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/common-functions b/bin/common-functions
index 74f3a54..31ce6f1 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -148,15 +148,15 @@ generate_package_metadata() {
# otherwise this just calls for trouble
sed -i '/^[^=]*=\s*$/d' "${file_prefix}.SRCINFO"
- # extract "builds" = provides \cup pkgname
- grep "$(printf '^\\(\tprovides\\|pkgname\\) = \\|^\tgroups = base')" "${file_prefix}.SRCINFO" | \
+ # extract "builds" = provides \cup pkgname \cup groups
+ grep "$(printf '^\\(\tprovides\\|\tgroups\\|pkgname\\) = ')" "${file_prefix}.SRCINFO" | \
cut -d= -f2 | \
sed 's|^\s\+||; s|[<>]$||' | \
sort -u > \
"${file_prefix}.builds"
- # extract "groups" = groups
- grep "$(printf '^\tgroups = ')" "${file_prefix}.SRCINFO" | \
+ # extract "groups" = groups \cup provides
+ grep "$(printf '^\t\\(groups\\|provides\\) = ')" "${file_prefix}.SRCINFO" | \
cut -d= -f2 | \
sed 's|^\s\+||; s|[<>]$||' | \
sort -u > \