Patchwork [meta-oe,V2,14/32] udisks: move systemd support to meta-systemd

login
register
mail settings
Submitter Andreas Müller
Date July 13, 2012, 8:30 a.m.
Message ID <1342168240-7760-15-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/31871/
State Accepted
Headers show

Comments

Andreas Müller - July 13, 2012, 8:30 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 +++-------
 .../udisks/udisks/add-systemd-support.patch        |    0
 .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13 +++++++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-support/udisks/udisks/add-systemd-support.patch (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
Koen Kooi - July 13, 2012, 8:56 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-07-12 10:30, Andreas Müller schreef:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- 
> meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 +++------- 
> .../udisks/udisks/add-systemd-support.patch        |    0 
> .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13 +++++++++++++

As a more generic remark about udisks and systemd: no need to start this
units on boot, they get automatically started when needed when using a GUI.
I'm not sure there are any non-GUI users of udisks currently, but if there
are, please speak up!

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFP/+KzMkyGM64RGpERAr9BAJ0bJnr9qyDywPIWZSBXdwsSW3SSBQCgkODi
H0mWKy1inlnWr6FlvoDzEOY=
=0AvB
-----END PGP SIGNATURE-----
Andreas Müller - July 13, 2012, 9:40 a.m.
On Fri, Jul 13, 2012 at 10:56 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 13-07-12 10:30, Andreas Müller schreef:
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---
>> meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 +++-------
>> .../udisks/udisks/add-systemd-support.patch        |    0
>> .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13 +++++++++++++
>
> As a more generic remark about udisks and systemd: no need to start this
> units on boot, they get automatically started when needed when using a GUI.
> I'm not sure there are any non-GUI users of udisks currently, but if there
> are, please speak up!
>
> regards,
>
> Koen
I did the udisks systemd patch long time ago [1]. At that time it
fixed automount problem in xfce dm-less environment. I will test
without starting on boot and let you know.

Andreas

[1] http://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/udisks?id=dc32361d19b49c9cb2df1d73dc61dfe7255a11b2
Koen Kooi - July 13, 2012, 10:59 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-07-12 11:40, Andreas Müller schreef:
> On Fri, Jul 13, 2012 at 10:56 AM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>> 
>> Op 13-07-12 10:30, Andreas Müller schreef:
>>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- 
>>> meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 +++------- 
>>> .../udisks/udisks/add-systemd-support.patch        |    0 
>>> .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13
>>> +++++++++++++
>> 
>> As a more generic remark about udisks and systemd: no need to start
>> this units on boot, they get automatically started when needed when
>> using a GUI. I'm not sure there are any non-GUI users of udisks
>> currently, but if there are, please speak up!
>> 
>> regards,
>> 
>> Koen
> I did the udisks systemd patch long time ago [1]. At that time it fixed
> automount problem in xfce dm-less environment. I will test without
> starting on boot and let you know.

To be clear: that change isn't needed for this patchset to go in :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFP//96MkyGM64RGpERAvM6AJ41XGUAU2NKxCqhYlv3GrTP/x/z3ACfTIr+
DXsxPGVTFlP/1qV+RcfO5RY=
=+wno
-----END PGP SIGNATURE-----

Patch

diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
index 0018a5f..b6448ef 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
@@ -2,22 +2,18 @@  DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces th
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273"
 
-DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0 systemd"
+DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0"
 # optional dependencies: device-mapper parted
 
 SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
-           file://add-systemd-support.patch \
            file://optional-depends.patch"
 
 SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b"
 SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5"
 
-PR = "r4"
+PR = "r5"
 
-inherit autotools systemd
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"
+inherit autotools
 
 EXTRA_OECONF = "--disable-man-pages"
 
diff --git a/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch b/meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
similarity index 100%
rename from meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
rename to meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
diff --git a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
new file mode 100644
index 0000000..f6470c9
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
@@ -0,0 +1,13 @@ 
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+# look for files in the layer first
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+DEPENDS += "systemd"
+
+SRC_URI += "file://add-systemd-support.patch"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"