diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-10 17:56:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-10 18:30:00 +0100 |
commit | 709f570c82bd4b591575336aa45ef483725e0378 (patch) | |
tree | 6062cb61e7704cc64fd857db2a5d071982ae0cb7 /meta | |
parent | cfbf6fad48f251d7eb76c7f99ac3f74cfbbcee07 (diff) | |
download | poky-709f570c82bd4b591575336aa45ef483725e0378.tar.gz |
pkgconfig: Drop the RREPLACES for pkgconfig-dev
This line causes pkgconfig-dev to replace pkgconfig so the package with all the files
in is replaced by one with no files. This makes no sense and hence we should just
remove this broken line.
At this point in the release, this is the safest way to fix this even if an empty -dev
package is left available.
[YOCTO #2878]
(From OE-Core rev: 5bed2bb831b379a8fbf2f725435af4b7c934359e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc index 10dba04896..8a8320e043 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc | |||
@@ -37,4 +37,3 @@ BBCLASSEXTEND = "native nativesdk" | |||
37 | # files. | 37 | # files. |
38 | FILES_${PN}-dev = "" | 38 | FILES_${PN}-dev = "" |
39 | FILES_${PN} += "${datadir}/aclocal/pkg.m4" | 39 | FILES_${PN} += "${datadir}/aclocal/pkg.m4" |
40 | RREPLACES_${PN}-dev = "${PN}" | ||
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb index 08a3dbfc29..1e60c54cbf 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require pkgconfig.inc | 1 | require pkgconfig.inc |
2 | 2 | ||
3 | PR = "r4" | 3 | PR = "r5" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" | 5 | SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" |
6 | SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" | 6 | SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" |