summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-10 17:56:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-10 17:57:39 +0100
commit5bed2bb831b379a8fbf2f725435af4b7c934359e (patch)
tree9eaea0c4d2ec7f9c326182357639be349cf38be8
parent9d002f7cdc5309c4d850a76e4fd73ff04c980a07 (diff)
downloadopenembedded-core-5bed2bb831b379a8fbf2f725435af4b7c934359e.tar.gz
openembedded-core-5bed2bb831b379a8fbf2f725435af4b7c934359e.tar.bz2
openembedded-core-5bed2bb831b379a8fbf2f725435af4b7c934359e.zip
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] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig.inc1
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb2
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"
# files.
FILES_${PN}-dev = ""
FILES_${PN} += "${datadir}/aclocal/pkg.m4"
-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 @@
require pkgconfig.inc
-PR = "r4"
+PR = "r5"
SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"