From: Michael Tremer Date: Sun, 24 Jul 2011 16:18:48 +0000 (+0200) Subject: build-essentials: Add support for prerequires. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b95b236ddc9d12f5ab925f06351c0dc569d660b;p=ipfire-3.x.git build-essentials: Add support for prerequires. --- diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index c70820446..e29fa4216 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -25,9 +25,9 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials -PKG_VER = $(DISTRO_VERSION) -PKG_REL = 20 -PKG_EPOCH = 1 +PKG_VER = 1.0 +PKG_REL = 1 +PKG_EPOCH = 2 PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer diff --git a/pkgs/build-essentials/buildsystem-tools/dependency-tracker b/pkgs/build-essentials/buildsystem-tools/dependency-tracker index 887b7f4d6..1c29025e4 100755 --- a/pkgs/build-essentials/buildsystem-tools/dependency-tracker +++ b/pkgs/build-essentials/buildsystem-tools/dependency-tracker @@ -16,8 +16,12 @@ for require in $(find_requires ${args}); do listmatch ${require} ${provides} || requires="${requires} ${require}" done -echo "provides=\"${provides}\"" +if [ -n "${PKG_PREREQUIRES}" ]; then + echo "prerequires=\"/bin/sh ${PKG_PREREQUIRES}\"" +fi echo "requires=\"${requires}\"" +echo "provides=\"${provides}\"" +echo "provides=\"${PKG_CONFLICTS}\"" echo "obsoletes=\"${PKG_OBSOLETES}\"" exit 0 diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index 19a5e8ab2..d46d5f3cc 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -61,8 +61,12 @@ SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d PKG_VARIABLES = \ CONTROL_PREIN \ CONTROL_PREUN \ + CONTROL_PREUP \ CONTROL_POSTIN \ CONTROL_POSTUN \ + CONTROL_POSTUP \ + CONTROL_POSTTRANSIN \ + CONTROL_POSTTRANSUN \ \ PKG_ARCH \ PKG_BUILD_DEPS \ @@ -80,6 +84,7 @@ PKG_VARIABLES = \ PKG_URL \ PKG_VER \ \ + PKG_PREREQUIRES \ PKG_PROVIDES_FILTER \ PKG_REQUIRES_FILTER