diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-11-22 21:10:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-24 15:12:30 +0000 |
commit | 002f48337737a746116fa69cb89c9a9e6b61bd92 (patch) | |
tree | 29e97e315938a3497f100fe1051ac69ea49f940f /meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch | |
parent | 9f836a4595dc4524ebd95db02165ef28dda51010 (diff) | |
download | poky-002f48337737a746116fa69cb89c9a9e6b61bd92.tar.gz |
opkg: bump SRCREV and drop applied patches
* only change upstream which wasn't in oe-core is
http://code.google.com/p/opkg/source/detail?r=635
and added testcase for that
(From OE-Core rev: 5fd1d515db5966f45a3b2f936f3c4225f59186e2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch | 24 |
1 files changed, 0 insertions, 24 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 deleted file mode 100644 index 669faef00a..0000000000 --- a/meta/recipes-devtools/opkg/opkg/don-t-print-provides-if-nothing-is-provided.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
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 ? "" : ",", | ||