diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch | 24 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg_svn.bb | 3 |
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 @@ | |||
1 | Every package provides itself. While printing package information all | ||
2 | fields are printed only if there is any relevant info for them. For | ||
3 | example: a package with no "Replaces" won't get this printed at all. | ||
4 | Packages which provide only themselves, were printing this field but with | ||
5 | no values. This patch skips this field if the package provides only | ||
6 | itself. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
10 | |||
11 | Index: 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 | ||
18 | S = "${WORKDIR}/trunk" | 19 | S = "${WORKDIR}/trunk" |
@@ -20,4 +21,4 @@ S = "${WORKDIR}/trunk" | |||
20 | SRCREV = "633" | 21 | SRCREV = "633" |
21 | PV = "0.1.8+svnr${SRCPV}" | 22 | PV = "0.1.8+svnr${SRCPV}" |
22 | 23 | ||
23 | PR = "${INC_PR}.7" | 24 | PR = "${INC_PR}.8" |