aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-07-16 18:07:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:29:53 +0100
commitb070eb22372ad1ef5b21162d832772e560184cf8 (patch)
tree8102b4207565e47a9e0e68cb596d9a94876d8ece /meta/recipes-core/glib-2.0
parent85a930188300152bc9a1bbf640a2441f3177e26f (diff)
downloadopenembedded-core-contrib-b070eb22372ad1ef5b21162d832772e560184cf8.tar.gz
openembedded-core-contrib-b070eb22372ad1ef5b21162d832772e560184cf8.tar.bz2
openembedded-core-contrib-b070eb22372ad1ef5b21162d832772e560184cf8.zip
glib: package bash-completion files in separate package and move ${PN}-codegen to .inc
* 2.32.4 has completion files in ${datadir}/bash-completion and dbus also packages bash-competion files in separate package Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb5
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc9
2 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
index fca5f8d029f..85352edb234 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
@@ -1,5 +1,6 @@
require glib.inc
+PR = "r1"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
@@ -46,7 +47,3 @@ do_install_append() {
sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/glib-mkenums
fi
}
-
-PACKAGES += "${PN}-codegen"
-FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py"
-FILES_${PN} += "${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index e7d547a7582..9ae02d9456e 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -16,7 +16,7 @@ SECTION = "libs"
DEPENDS = "glib-2.0-native gtk-doc-native zip virtual/libiconv"
DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
-PACKAGES =+ "${PN}-utils "
+PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
LEAD_SONAME = "libglib-2.0.*"
FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
@@ -31,12 +31,17 @@ EXTRA_OECONF = "--disable-debug --enable-included-printf=no ${CORECONF}"
EXTRA_OECONF_virtclass-native = "${CORECONF}"
EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}"
-FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \
+ ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
FILES_${PN}-dev += "${libdir}/glib-2.0/include \
${libdir}/gio/modules/lib*${SOLIBSDEV} \
${libdir}/gio/modules/*.la"
FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \
${libdir}/gio/modules/.debug"
+FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py"
+FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \
+ ${datadir}/bash-completion"
ARM_INSTRUCTION_SET = "arm"
USE_NLS = "yes"