From 1281bf3492e7be6adfda3d345edd3afdb29c7681 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 11 Jul 2017 23:36:16 +0200 Subject: treat base and base-devel like dependencies --- bin/common-functions | 2 +- bin/get-package-updates | 2 ++ bin/mksrcinfo | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf