diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-03-23 10:59:08 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:55:50 +0100 |
commit | cc97d5760100415ed22fa329e8962e5f37b8d741 (patch) | |
tree | 0b0ea4f149b8467003fdb4a21055652813adbcdb /meta | |
parent | cef8bc9e80cf5e3620df1cb54e6ac0305f8f92d9 (diff) | |
download | poky-cc97d5760100415ed22fa329e8962e5f37b8d741.tar.gz |
glib-2.0: Fix packaging
* move gdbus-codegen to ${PN}-codegen
* move other development tools and data files to ${PN}-dev
* remove references to non-existent paths
(From OE-Core rev: 351064e9c5deb6411c8a0d40ebd4fd4f83299d4e)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index bce3ce7bea..3a03191ba0 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -22,10 +22,9 @@ DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' dbus', '', d)}" | |||
22 | DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" | 22 | DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" |
23 | DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib glib-2.0-native" | 23 | DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib glib-2.0-native" |
24 | 24 | ||
25 | PACKAGES =+ "${PN}-utils ${PN}-codegen" | 25 | PACKAGES += "${PN}-codegen ${PN}-utils" |
26 | 26 | ||
27 | LEAD_SONAME = "libglib-2.0.*" | 27 | LEAD_SONAME = "libglib-2.0.*" |
28 | FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" | ||
29 | 28 | ||
30 | inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache | 29 | inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache |
31 | 30 | ||
@@ -51,14 +50,21 @@ do_configure_prepend() { | |||
51 | FILES_${PN} = "${libdir}/lib*${SOLIBS} \ | 50 | FILES_${PN} = "${libdir}/lib*${SOLIBS} \ |
52 | ${libdir}/gio \ | 51 | ${libdir}/gio \ |
53 | ${libexecdir}/*gio-querymodules \ | 52 | ${libexecdir}/*gio-querymodules \ |
54 | ${datadir}/glib-2.0/schemas \ | 53 | ${datadir}/glib-2.0/schemas" |
55 | ${datadir}/glib-2.0/gettext/mkinstalldirs \ | ||
56 | ${datadir}/glib-2.0/gettext/po/Makefile.in.in" | ||
57 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ | 54 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ |
58 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ | 55 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ |
59 | ${libdir}/gio/modules/*.la" | 56 | ${libdir}/gio/modules/*.la \ |
57 | ${bindir}/glib-genmarshal \ | ||
58 | ${bindir}/glib-gettextize \ | ||
59 | ${bindir}/glib-mkenums \ | ||
60 | ${bindir}/glib-compile-schemas \ | ||
61 | ${bindir}/glib-compile-resources \ | ||
62 | ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ | ||
63 | ${datadir}/glib-2.0/schemas/gschema.dtd" | ||
60 | FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" | 64 | FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" |
61 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" | 65 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ |
66 | ${bindir}/gdbus-codegen" | ||
67 | FILES_${PN}-utils = "${bindir}/*" | ||
62 | 68 | ||
63 | ARM_INSTRUCTION_SET_armv4 = "arm" | 69 | ARM_INSTRUCTION_SET_armv4 = "arm" |
64 | ARM_INSTRUCTION_SET_armv5 = "arm" | 70 | ARM_INSTRUCTION_SET_armv5 = "arm" |