summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 00:36:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-28 09:20:51 +0100
commit6475aaecc926c7dffbd4cd76344073415e34d0b8 (patch)
tree64f436bee7db4141e52b7a40b3164962031e54a0 /meta
parent456b859203834b34cc57a608ae317bac462abf32 (diff)
downloadpoky-6475aaecc926c7dffbd4cd76344073415e34d0b8.tar.gz
pkgconfig: Fix packaging issue
The pkg.m4 file should be packaged as part of the base package instead of the -dev package, it had been in the base package, but I seemed to have missed that it moved during my PACKAGES reorder, and this caused the meta-toolchain to break [YOCTO #1908] (From OE-Core rev: d2dba9aebef323a57824b41d09991850c703be35) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig.inc5
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb2
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 00c23d7ff8..10dba04896 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -32,4 +32,9 @@ do_configure_prepend () {
32 32
33BBCLASSEXTEND = "native nativesdk" 33BBCLASSEXTEND = "native nativesdk"
34 34
35# Set an empty dev package to ensure the base PN package gets
36# the pkg.m4 macros, pkgconfig does not deliver any other -dev
37# files.
38FILES_${PN}-dev = ""
35FILES_${PN} += "${datadir}/aclocal/pkg.m4" 39FILES_${PN} += "${datadir}/aclocal/pkg.m4"
40RREPLACES_${PN}-dev = "${PN}"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index 1d7ba49b95..08a3dbfc29 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -1,6 +1,6 @@
1require pkgconfig.inc 1require pkgconfig.inc
2 2
3PR = "r3" 3PR = "r4"
4 4
5SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" 5SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
6SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" 6SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"