[oe] [PATCH] udisks: updated to v2.1.1.

[Yevhen Kyriukha]

2014/1/6 Koen Kooi <koen at dominion.thruhere.net>:
>
> Op 6 jan. 2014, om 17:12 heeft Koen Kooi <koen at dominion.thruhere.net> het volgende geschreven:
>
>> From: Yevhen Kyriukha <kirgene at gmail.com>
>>
>> One patch was removed because changes are already exist in upstream version.
>> Added patch to turn libatasmart, polkit, acl and libsystemd-login into optional dependencies.
>>
>> Signed-off-by: Yevhen Kyriukha <kirgene at gmail.com>
>> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
>
> Gah, stupid muscle memory, that SOB is premature
>
>> ---
>
> I played a bit with this patch and I have a few questions
>
>
>> diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb b/meta-oe/recipes-support/udisks/udisks_2.1.1.bb
>> similarity index 34%
>> rename from meta-oe/recipes-support/udisks/udisks_1.0.4.bb
>> rename to meta-oe/recipes-support/udisks/udisks_2.1.1.bb
>> index 32f0c11..9eff5e1 100644
>> --- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
>> +++ b/meta-oe/recipes-support/udisks/udisks_2.1.1.bb
>> @@ -1,39 +1,38 @@
>> DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces that can be used to query and manipulate storage devices."
>> LICENSE = "GPLv2+"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43"
>>
>> -DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0"
>> -# optional dependencies: device-mapper parted
>> +DEPENDS = "udev dbus-glib glib-2.0"
>>
>> DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
>
> [..]
>
>> inherit autotools systemd
>>
>> -PACKAGECONFIG ??= ""
>> -PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted"
>> +PACKAGECONFIG ??= "atasmart polkit acl ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd-login', '', d)}"
>> +PACKAGECONFIG[atasmart] = "--enable-libatasmart,--disable-libatasmart,libatasmart"
>> +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
>> +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
>> +PACKAGECONFIG[systemd-login] = "--enable-libsystemd-login,--disable-libsystemd-login,systemd"
>
> I think 3 different ways to add systemd to DEPENDS is a bit much, the inherit + PACKAGECONFIG should be enough. Also, what happened to the parted PACKAGECONFIG?
>

You're right, I'll remove redundant DEPENDS statement for systemd.
As for parted, udisks doesn't depend on it already during compile.

> regards,
>
> Koen
>
>
>>
>> -EXTRA_OECONF = "--disable-man-pages"
>> +EXTRA_OECONF = "--disable-man"
>> +
>> +PACKAGES =+ "${PN}-bash-completion"
>>
>> FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
>>                 ${datadir}/dbus-1/ \
>>                 ${datadir}/polkit-1 \
>>                 ${base_libdir}/udev/* \
>> +                ${libdir}/udisks2/* \
>> "
>> +FILES_${PN}-dbg += "${base_libdir}/udev/.debug \
>> +             ${libdir}/udisks2/.debug"
>> +FILES_${PN}-bash-completion = "${datadir}/bash-completion"
>>
>> -FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
>> -
>> -RPROVIDES_${PN} += "${PN}-systemd"
>> -RREPLACES_${PN} += "${PN}-systemd"
>> -RCONFLICTS_${PN} += "${PN}-systemd"
>> -SYSTEMD_SERVICE_${PN} = "udisks-daemon.service"
>> +SYSTEMD_SERVICE_${PN} = "udisks2.service"
>> SYSTEMD_AUTO_ENABLE = "disable"
>> --
>> 1.8.4
>>
>>
>