summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2012-10-21 18:40:41 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-23 12:28:32 +0100
commitdd0377397742db86c4e9e3ab9e5b7726943233f8 (patch)
tree73d5ba0acd2e752812e841dc4d00a12d5eb22d35
parente702a1abfff62780ee28b7487564d4b8243cc084 (diff)
downloadpoky-dd0377397742db86c4e9e3ab9e5b7726943233f8.tar.gz
opkg: Don't print empty PROVIDES
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. (From OE-Core rev: 19af022c73ebc53f7008a016c1e7c584fb7b0054) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch24
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb3
2 files changed, 26 insertions, 1 deletions
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 0000000000..669faef00a
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch
@@ -0,0 +1,24 @@
1Every package provides itself. While printing package information all
2fields are printed only if there is any relevant info for them. For
3example: a package with no "Replaces" won't get this printed at all.
4Packages which provide only themselves, were printing this field but with
5no values. This patch skips this field if the package provides only
6itself.
7
8Upstream-Status: Pending
9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
10
11Index: trunk/libopkg/pkg.c
12===================================================================
13--- trunk.orig/libopkg/pkg.c 2011-12-18 02:11:34.000000000 +0200
14+++ trunk/libopkg/pkg.c 2012-10-20 22:20:04.109201287 +0300
15@@ -731,7 +731,8 @@
16 } else if (strcasecmp(field, "Priority") == 0) {
17 fprintf(fp, "Priority: %s\n", pkg->priority);
18 } else if (strcasecmp(field, "Provides") == 0) {
19- if (pkg->provides_count) {
20+ /* Don't print provides if this package provides only itself */
21+ if (pkg->provides_count > 1) {
22 fprintf(fp, "Provides:");
23 for(i = 1; i < pkg->provides_count; i++) {
24 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 3a90677648..e1049a71de 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 \
13 file://0010-pkg_depends-fix-version_constraints_satisfied.patch \ 13 file://0010-pkg_depends-fix-version_constraints_satisfied.patch \
14 file://opkg-no-sync-offline.patch \ 14 file://opkg-no-sync-offline.patch \
15 file://don-t-add-recommends-pkgs-to-depended-upon-by.patch \ 15 file://don-t-add-recommends-pkgs-to-depended-upon-by.patch \
16 file://don-t-print-provides-if-nothing-is-provided.patch \
16" 17"
17 18
18S = "${WORKDIR}/trunk" 19S = "${WORKDIR}/trunk"
@@ -20,4 +21,4 @@ S = "${WORKDIR}/trunk"
20SRCREV = "633" 21SRCREV = "633"
21PV = "0.1.8+svnr${SRCPV}" 22PV = "0.1.8+svnr${SRCPV}"
22 23
23PR = "${INC_PR}.7" 24PR = "${INC_PR}.8"