diff options
Diffstat (limited to 'meta/recipes-core/dbus/dbus.inc')
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 12 |
1 files changed, 6 insertions, 6 deletions
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 \ | |||
7 | file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" | 7 | file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" |
8 | X11DEPENDS = "virtual/libx11 libsm" | 8 | X11DEPENDS = "virtual/libx11 libsm" |
9 | DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" | 9 | DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" |
10 | DEPENDS_virtclass-native = "expat-native virtual/libintl-native" | 10 | DEPENDS_class-native = "expat-native virtual/libintl-native" |
11 | DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" | 11 | DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" |
12 | 12 | ||
13 | INC_PR = "r5" | 13 | INC_PR = "r5" |
14 | 14 | ||
@@ -34,7 +34,7 @@ DEBIANNAME_${PN} = "dbus-1" | |||
34 | PACKAGES =+ "${PN}-lib ${PN}-systemd" | 34 | PACKAGES =+ "${PN}-lib ${PN}-systemd" |
35 | 35 | ||
36 | OLDPKGNAME = "dbus-x11" | 36 | OLDPKGNAME = "dbus-x11" |
37 | OLDPKGNAME_virtclass-nativesdk = "" | 37 | OLDPKGNAME_class-nativesdk = "" |
38 | 38 | ||
39 | # for compatibility | 39 | # for compatibility |
40 | RPROVIDES_${PN} = "${OLDPKGNAME}" | 40 | RPROVIDES_${PN} = "${OLDPKGNAME}" |
@@ -64,7 +64,7 @@ pkg_postinst_dbus() { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" | 66 | EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" |
67 | EXTRA_OECONF_X_virtclass-native = "--without-x --disable-x11-autolaunch" | 67 | EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch" |
68 | 68 | ||
69 | EXTRA_OECONF = "--disable-tests \ | 69 | EXTRA_OECONF = "--disable-tests \ |
70 | --disable-checks \ | 70 | --disable-checks \ |
@@ -105,7 +105,7 @@ do_install() { | |||
105 | ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service | 105 | ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service |
106 | } | 106 | } |
107 | 107 | ||
108 | do_install_virtclass-native() { | 108 | do_install_class-native() { |
109 | autotools_do_install | 109 | autotools_do_install |
110 | 110 | ||
111 | # for dbus-glib-native introspection generation | 111 | # for dbus-glib-native introspection generation |
@@ -117,7 +117,7 @@ do_install_virtclass-native() { | |||
117 | ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml | 117 | ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml |
118 | } | 118 | } |
119 | 119 | ||
120 | do_install_virtclass-nativesdk() { | 120 | do_install_class-nativesdk() { |
121 | autotools_do_install | 121 | autotools_do_install |
122 | } | 122 | } |
123 | BBCLASSEXTEND = "native nativesdk" | 123 | BBCLASSEXTEND = "native nativesdk" |