summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-07-11 23:36:16 +0200
committerErich Eckner <git@eckner.net>2017-07-11 23:36:16 +0200
commit1281bf3492e7be6adfda3d345edd3afdb29c7681 (patch)
treed7a144c35200dd01dc51a20f083ce08ed2eb8bc3 /bin
parentdd1cf581ca9d07b80bc9c0ff7b39bf5dcadfe682 (diff)
downloadbuilder-1281bf3492e7be6adfda3d345edd3afdb29c7681.tar.xz
treat base and base-devel like dependencies
Diffstat (limited to 'bin')
-rwxr-xr-xbin/common-functions2
-rwxr-xr-xbin/get-package-updates2
-rwxr-xr-xbin/mksrcinfo1
3 files changed, 4 insertions, 1 deletions
diff --git a/bin/common-functions b/bin/common-functions
index 9b89860..39690ee 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -152,7 +152,7 @@ generate_package_metadata() {
sed -i '/=\s*$/d' "${file_prefix}.SRCINFO"
# extract "builds" = provides \cup pkgname
- grep "$(printf '^\\(\tprovides\\|pkgname\\) = ')" "${file_prefix}.SRCINFO" | \
+ grep "$(printf '^\\(\tprovides\\|pkgname\\) = \\|^\tgroups = base')" "${file_prefix}.SRCINFO" | \
cut -d= -f2 | \
sed 's|^\s\+||; s|[<>]$||' | \
sort -u > \
diff --git a/bin/get-package-updates b/bin/get-package-updates
index e698217..bc2de0f 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -287,6 +287,8 @@ while read -r package git_revision mod_git_revision repository; do
sed "s|^|${package} |" "${work_dir}/package-infos/${package}.${git_revision}.${mod_git_revision}.builds"
# add "$dependency -> $pkgname" to build-order list
sed "s|\$| ${package}|" "${work_dir}/package-infos/${package}.${git_revision}.${mod_git_revision}.needs"
+ # add "base/base-devel -> $pkgname" to build-order list
+ printf "%s ${package}\n" 'base' 'base-devel'
done \
< "${work_dir}/build-list.new" \
> "${work_dir}/build-order"
diff --git a/bin/mksrcinfo b/bin/mksrcinfo
index 40cb7d0..4a38b00 100755
--- a/bin/mksrcinfo
+++ b/bin/mksrcinfo
@@ -12,6 +12,7 @@
printf 'pkgbase = %s\n' "${pkgbase}"
fi
printf '\tarch = %s\n' "${arch[@]}"
+ printf '\tgroups = %s\n' "${groups[@]}"
for print in 'makedepends' 'checkdepends' 'depends' 'provides'; do
eval printf "'\t${print} = %s\n'" '"${'"${print}"'[@]}"'
for a in 'i686'; do