diff options
Diffstat (limited to 'meta/recipes-core/dbus')
-rw-r--r-- | meta/recipes-core/dbus/dbus-test_1.12.18.bb | 38 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 34 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.12.18.bb | 39 |
3 files changed, 47 insertions, 64 deletions
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.18.bb b/meta/recipes-core/dbus/dbus-test_1.12.18.bb index 68fcdc847f..755c841bad 100644 --- a/meta/recipes-core/dbus/dbus-test_1.12.18.bb +++ b/meta/recipes-core/dbus/dbus-test_1.12.18.bb | |||
@@ -1,53 +1,31 @@ | |||
1 | SUMMARY = "D-Bus test package (for D-bus functionality testing only)" | 1 | SUMMARY = "D-Bus test package (for D-bus functionality testing only)" |
2 | HOMEPAGE = "http://dbus.freedesktop.org" | 2 | HOMEPAGE = "http://dbus.freedesktop.org" |
3 | SECTION = "base" | 3 | SECTION = "base" |
4 | LICENSE = "AFL-2.1 | GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ | ||
6 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" | ||
7 | 4 | ||
8 | DEPENDS = "dbus glib-2.0" | 5 | require dbus.inc |
9 | 6 | ||
10 | RDEPENDS_${PN}-dev = "" | 7 | SRC_URI += "file://run-ptest \ |
8 | file://python-config.patch \ | ||
9 | " | ||
11 | 10 | ||
12 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | 11 | DEPENDS = "dbus glib-2.0" |
13 | file://tmpdir.patch \ | ||
14 | file://run-ptest \ | ||
15 | file://python-config.patch \ | ||
16 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | ||
17 | " | ||
18 | 12 | ||
19 | SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242" | 13 | RDEPENDS_${PN}-dev = "" |
20 | SRC_URI[sha256sum] = "64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306" | ||
21 | 14 | ||
22 | S="${WORKDIR}/dbus-${PV}" | 15 | S="${WORKDIR}/dbus-${PV}" |
23 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" | 16 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" |
24 | 17 | ||
25 | inherit autotools pkgconfig gettext ptest upstream-version-is-even | 18 | inherit ptest |
26 | 19 | ||
27 | EXTRA_OECONF = "--enable-tests \ | 20 | EXTRA_OECONF += "--enable-tests \ |
28 | --enable-modular-tests \ | 21 | --enable-modular-tests \ |
29 | --enable-installed-tests \ | 22 | --enable-installed-tests \ |
30 | --enable-checks \ | 23 | --enable-checks \ |
31 | --enable-asserts \ | 24 | --enable-asserts \ |
32 | --enable-largefile \ | ||
33 | --disable-xml-docs \ | ||
34 | --disable-doxygen-docs \ | ||
35 | --disable-libaudit \ | ||
36 | --with-dbus-test-dir=${PTEST_PATH} \ | 25 | --with-dbus-test-dir=${PTEST_PATH} \ |
37 | --enable-embedded-tests \ | 26 | --enable-embedded-tests \ |
38 | " | 27 | " |
39 | 28 | ||
40 | EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" | ||
41 | |||
42 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}" | ||
43 | PACKAGECONFIG_class-native = "" | ||
44 | PACKAGECONFIG_class-nativesdk = "" | ||
45 | |||
46 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" | ||
47 | PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" | ||
48 | PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" | ||
49 | PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," | ||
50 | |||
51 | do_install() { | 29 | do_install() { |
52 | : | 30 | : |
53 | } | 31 | } |
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc new file mode 100644 index 0000000000..3bdb7ea4ff --- /dev/null +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -0,0 +1,34 @@ | |||
1 | inherit autotools pkgconfig gettext upstream-version-is-even | ||
2 | |||
3 | LICENSE = "AFL-2.1 | GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ | ||
5 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" | ||
6 | |||
7 | SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | ||
8 | file://tmpdir.patch \ | ||
9 | file://dbus-1.init \ | ||
10 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | ||
11 | " | ||
12 | |||
13 | SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242" | ||
14 | SRC_URI[sha256sum] = "64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306" | ||
15 | |||
16 | EXTRA_OECONF = "--disable-xml-docs \ | ||
17 | --disable-doxygen-docs \ | ||
18 | --disable-libaudit \ | ||
19 | --enable-largefile \ | ||
20 | --with-system-socket=/run/dbus/system_bus_socket \ | ||
21 | " | ||
22 | EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" | ||
23 | EXTRA_OECONF_append_class-native = " --disable-selinux" | ||
24 | |||
25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ | ||
26 | user-session \ | ||
27 | " | ||
28 | PACKAGECONFIG_class-native = "" | ||
29 | PACKAGECONFIG_class-nativesdk = "" | ||
30 | |||
31 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" | ||
32 | PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" | ||
33 | PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" | ||
34 | PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," | ||
diff --git a/meta/recipes-core/dbus/dbus_1.12.18.bb b/meta/recipes-core/dbus/dbus_1.12.18.bb index 2fcb3079ad..cf6f7dc0ef 100644 --- a/meta/recipes-core/dbus/dbus_1.12.18.bb +++ b/meta/recipes-core/dbus/dbus_1.12.18.bb | |||
@@ -2,9 +2,9 @@ SUMMARY = "D-Bus message bus" | |||
2 | DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed." | 2 | DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed." |
3 | HOMEPAGE = "https://dbus.freedesktop.org" | 3 | HOMEPAGE = "https://dbus.freedesktop.org" |
4 | SECTION = "base" | 4 | SECTION = "base" |
5 | LICENSE = "AFL-2.1 | GPLv2+" | 5 | |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ | 6 | require dbus.inc |
7 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" | 7 | |
8 | DEPENDS = "expat virtual/libintl autoconf-archive" | 8 | DEPENDS = "expat virtual/libintl autoconf-archive" |
9 | RDEPENDS_dbus_class-native = "" | 9 | RDEPENDS_dbus_class-native = "" |
10 | RDEPENDS_dbus_class-nativesdk = "" | 10 | RDEPENDS_dbus_class-nativesdk = "" |
@@ -12,16 +12,7 @@ PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', | |||
12 | ALLOW_EMPTY_dbus-ptest = "1" | 12 | ALLOW_EMPTY_dbus-ptest = "1" |
13 | RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" | 13 | RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" |
14 | 14 | ||
15 | SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | 15 | inherit useradd update-rc.d |
16 | file://tmpdir.patch \ | ||
17 | file://dbus-1.init \ | ||
18 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242" | ||
22 | SRC_URI[sha256sum] = "64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306" | ||
23 | |||
24 | inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even | ||
25 | 16 | ||
26 | INITSCRIPT_NAME = "dbus-1" | 17 | INITSCRIPT_NAME = "dbus-1" |
27 | INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." | 18 | INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." |
@@ -92,27 +83,7 @@ pkg_postinst_dbus() { | |||
92 | } | 83 | } |
93 | 84 | ||
94 | 85 | ||
95 | EXTRA_OECONF = "--disable-tests \ | 86 | EXTRA_OECONF += "--disable-tests" |
96 | --disable-xml-docs \ | ||
97 | --disable-doxygen-docs \ | ||
98 | --disable-libaudit \ | ||
99 | --enable-largefile \ | ||
100 | --with-system-socket=/run/dbus/system_bus_socket \ | ||
101 | " | ||
102 | |||
103 | EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" | ||
104 | EXTRA_OECONF_append_class-native = " --disable-selinux" | ||
105 | |||
106 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ | ||
107 | user-session \ | ||
108 | " | ||
109 | |||
110 | PACKAGECONFIG_class-native = "" | ||
111 | PACKAGECONFIG_class-nativesdk = "" | ||
112 | |||
113 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" | ||
114 | PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" | ||
115 | PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" | ||
116 | 87 | ||
117 | do_install() { | 88 | do_install() { |
118 | autotools_do_install | 89 | autotools_do_install |