mirrors/poky
1
0 Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-10-20 18:38:18 +00:00
Code Issues Projects Releases Wiki Activity

opkg: Don't print empty PROVIDES

Browse Source 
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>
This commit is contained in:
Andrei Gherzan authored and Richard Purdie committed 2012-10-23 12:28:32 +01:00
1 parent e702a1abff
commit dd03773977
2 files changed
+26 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch
+24
View File
@@ -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 <andrei@gherzan.ro>
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 ? "" : ",",
meta/recipes-devtools/opkg/opkg_svn.bb
+2 -1
View File
@@ -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"