diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2012-10-27 16:48:17 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-02 16:15:29 +0000 |
| commit | 5193485a42dfb3396d0f12aaa7732c5db29d7338 (patch) | |
| tree | d2fe40ae9bedc1b28057216571af4f99aa56fd4f /meta/recipes-core/dbus | |
| parent | 0c1c0a890f6e99608eda3d20a6b89027a2c72e96 (diff) | |
| download | openembedded-core-contrib-5193485a42dfb3396d0f12aaa7732c5db29d7338.tar.gz | |
recipes-core: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dbus')
| -rw-r--r-- | meta/recipes-core/dbus/dbus-glib.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index 3469a4f2b1..dff30c7564 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ SECTION = "base" DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" -DEPENDS_virtclass-native = "glib-2.0-native dbus-native" +DEPENDS_class-native = "glib-2.0-native dbus-native" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ file://no-examples.patch \ @@ -24,7 +24,7 @@ PACKAGECONFIG[tests] = "--enable-tests,,," EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \ --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" -EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" +EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" PACKAGES += "${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests" diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 550eb0ab3b..d165cdd878 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" X11DEPENDS = "virtual/libx11 libsm" DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" -DEPENDS_virtclass-native = "expat-native virtual/libintl-native" -DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" +DEPENDS_class-native = "expat-native virtual/libintl-native" +DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" INC_PR = "r5" @@ -34,7 +34,7 @@ DEBIANNAME_${PN} = "dbus-1" PACKAGES =+ "${PN}-lib ${PN}-systemd" OLDPKGNAME = "dbus-x11" -OLDPKGNAME_virtclass-nativesdk = "" +OLDPKGNAME_class-nativesdk = "" # for compatibility RPROVIDES_${PN} = "${OLDPKGNAME}" @@ -64,7 +64,7 @@ pkg_postinst_dbus() { } EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" -EXTRA_OECONF_X_virtclass-native = "--without-x --disable-x11-autolaunch" +EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch" EXTRA_OECONF = "--disable-tests \ --disable-checks \ @@ -105,7 +105,7 @@ do_install() { ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service } -do_install_virtclass-native() { +do_install_class-native() { autotools_do_install # for dbus-glib-native introspection generation @@ -117,7 +117,7 @@ do_install_virtclass-native() { ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml } -do_install_virtclass-nativesdk() { +do_install_class-nativesdk() { autotools_do_install } BBCLASSEXTEND = "native nativesdk" |