diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-11-04 17:26:00 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-04 19:41:20 +0100 |
commit | 77baa7401844ad46e0c6a0a7234b9ca023d45710 (patch) | |
tree | 590daed1b73ae31e6e2fa1b852a467a349ce9594 /meta-oe/recipes-connectivity | |
parent | 39ce6e1fbba636b21f635ac9aa3c3155e259fb6c (diff) | |
download | meta-openembedded-77baa7401844ad46e0c6a0a7234b9ca023d45710.tar.gz |
connman: refactor systemd packaging
This changes the recipe to use systemd.bbclass to avoid duplicating
code and also fix the rdepends of connman-systemd on connman.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r-- | meta-oe/recipes-connectivity/connman/connman.inc | 24 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/connman/connman_0.77.bb | 2 |
2 files changed, 6 insertions, 20 deletions
diff --git a/meta-oe/recipes-connectivity/connman/connman.inc b/meta-oe/recipes-connectivity/connman/connman.inc index 8209502f9..88b2e5106 100644 --- a/meta-oe/recipes-connectivity/connman/connman.inc +++ b/meta-oe/recipes-connectivity/connman/connman.inc | |||
@@ -31,9 +31,12 @@ EXTRA_OECONF += "\ | |||
31 | INITSCRIPT_NAME = "connman" | 31 | INITSCRIPT_NAME = "connman" |
32 | INITSCRIPT_PARAMS = "start 05 5 2 . stop 22 0 1 6 ." | 32 | INITSCRIPT_PARAMS = "start 05 5 2 . stop 22 0 1 6 ." |
33 | 33 | ||
34 | SYSTEMD_PACKAGES = "${PN}-systemd" | ||
35 | SYSTEMD_SERVICE_${PN}-systemd = "connman.service" | ||
36 | |||
34 | PARALLEL_MAKE = "" | 37 | PARALLEL_MAKE = "" |
35 | 38 | ||
36 | inherit autotools pkgconfig update-rc.d | 39 | inherit autotools pkgconfig update-rc.d systemd |
37 | 40 | ||
38 | do_configure_append() { | 41 | do_configure_append() { |
39 | ln -sf . include/connman | 42 | ln -sf . include/connman |
@@ -84,24 +87,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ | |||
84 | PACKAGES =+ "${PN}-systemd" | 87 | PACKAGES =+ "${PN}-systemd" |
85 | # Package up systemd files | 88 | # Package up systemd files |
86 | FILES_${PN}-systemd += "${base_libdir}/systemd" | 89 | FILES_${PN}-systemd += "${base_libdir}/systemd" |
87 | 90 | RDEPENDS_${PN}-systemd += "${PN}" | |
88 | pkg_postinst_connman-systemd() { | ||
89 | # can't do this offline | ||
90 | if [ "x$D" != "x" ]; then | ||
91 | exit 1 | ||
92 | fi | ||
93 | |||
94 | systemctl enable connman.service | ||
95 | } | ||
96 | |||
97 | pkg_postrm_connman-systemd() { | ||
98 | # can't do this offline | ||
99 | if [ "x$D" != "x" ]; then | ||
100 | exit 1 | ||
101 | fi | ||
102 | |||
103 | systemctl disable connman.service | ||
104 | } | ||
105 | 91 | ||
106 | # Needed when using DNS proxy feature | 92 | # Needed when using DNS proxy feature |
107 | RRECOMMENDS_${PN} += "dnsmasq-dbus" | 93 | RRECOMMENDS_${PN} += "dnsmasq-dbus" |
diff --git a/meta-oe/recipes-connectivity/connman/connman_0.77.bb b/meta-oe/recipes-connectivity/connman/connman_0.77.bb index 6d9c87cec..9c93e516b 100644 --- a/meta-oe/recipes-connectivity/connman/connman_0.77.bb +++ b/meta-oe/recipes-connectivity/connman/connman_0.77.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require connman.inc | 1 | require connman.inc |
2 | PR = "r2" | 2 | PR = "r3" |
3 | 3 | ||
4 | EXTRA_OECONF += "\ | 4 | EXTRA_OECONF += "\ |
5 | --disable-gtk-doc \ | 5 | --disable-gtk-doc \ |