From patchwork Sun Oct 21 15:40:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V2,3/5] opkg: Don't print empty PROVIDES Date: Sun, 21 Oct 2012 15:40:41 -0000 From: Andrei Gherzan X-Patchwork-Id: 38373 Message-Id: <67ff120a7b9e2b737d9b52cfbb62456e1f7fae60.1350833713.git.andrei@gherzan.ro> To: openembedded-core@lists.openembedded.org Every package provides itself. While printing package information all fields are printed only if there is any relevant info for them. For example: a package with no "Replaces" won't get this printed at all. Packages which provide only themselves, were printing this field but with no values. This patch skips this field if the package provides only itself. Signed-off-by: Andrei Gherzan --- ...n-t-print-provides-if-nothing-is-provided.patch | 24 ++++++++++++++++++++ meta/recipes-devtools/opkg/opkg_svn.bb | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch diff --git a/meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch b/meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch new file mode 100644 index 0000000..669faef --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch @@ -0,0 +1,24 @@ +Every package provides itself. While printing package information all +fields are printed only if there is any relevant info for them. For +example: a package with no "Replaces" won't get this printed at all. +Packages which provide only themselves, were printing this field but with +no values. This patch skips this field if the package provides only +itself. + +Upstream-Status: Pending +Signed-off-by: Andrei Gherzan + +Index: trunk/libopkg/pkg.c +=================================================================== +--- trunk.orig/libopkg/pkg.c 2011-12-18 02:11:34.000000000 +0200 ++++ trunk/libopkg/pkg.c 2012-10-20 22:20:04.109201287 +0300 +@@ -731,7 +731,8 @@ + } else if (strcasecmp(field, "Priority") == 0) { + fprintf(fp, "Priority: %s\n", pkg->priority); + } else if (strcasecmp(field, "Provides") == 0) { +- if (pkg->provides_count) { ++ /* Don't print provides if this package provides only itself */ ++ if (pkg->provides_count > 1) { + fprintf(fp, "Provides:"); + for(i = 1; i < pkg->provides_count; i++) { + fprintf(fp, "%s %s", i == 1 ? "" : ",", diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb index 3a90677..e1049a7 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb @@ -13,6 +13,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \ file://0010-pkg_depends-fix-version_constraints_satisfied.patch \ file://opkg-no-sync-offline.patch \ file://don-t-add-recommends-pkgs-to-depended-upon-by.patch \ + file://don-t-print-provides-if-nothing-is-provided.patch \ " S = "${WORKDIR}/trunk" @@ -20,4 +21,4 @@ S = "${WORKDIR}/trunk" SRCREV = "633" PV = "0.1.8+svnr${SRCPV}" -PR = "${INC_PR}.7" +PR = "${INC_PR}.8"