From 89917e5af7236e7544323bc7a81ac9e88b854bf1 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 11 Sep 2018 15:32:56 +0200 Subject: bin/build-packages: add "glibc>=$installed_glibc_version" as dependency --- bin/build-packages | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/build-packages b/bin/build-packages index d6a2ede..982a908 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -11,8 +11,6 @@ # TODO: report back memory and hdd stats to the build master on successful build -# TODO: if linked against glibc, add ">=$installed_glibc_version" - # shellcheck disable=SC2016 usage() { >&2 echo '' @@ -533,7 +531,13 @@ while [ "${count}" -ne 0 ] && \ find "${tar_content_dir}" -maxdepth 1 \ -name '*.pkg.tar.xz' | \ while read -r pkgfile; do - touch "${pkgfile}.so.needs" + tar -OxJf "${pkgfile}" '.BUILDINFO' 2>/dev/null | \ + sed -n ' + s/^installed = \(glibc\)-\([0-9.]\+\)\(-[^-]\+\)\{2\}$/\1>=\2/ + T + p + ' > \ + "${pkgfile}.so.needs" if printf '%s\n' "${pkgfile}" | \ grep -vq -- '-any\.pkg\.tar\.xz$'; then # we do not check "any" packages for linked libraries -- cgit v1.2.3-54-g00ecf