diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:37:55 +0100 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:37:55 +0100 |
commit | df4ed283e18f3dfe9f42f0012b12cb0af57bcdbb (patch) | |
tree | 40ad4b148e24c47d319bbbd23bbfc4af75a36e94 /meta-agl-profile-core/recipes-support/udisks | |
parent | d40e55dbb362c455f0ee863b23c21ac2628cf3f8 (diff) | |
parent | 47aa65ba73e1b29459171de24fb0ee0040cbb39c (diff) |
Merge remote-tracking branch 'agl/next'
* agl/next:
meta-agl-bsp: Add CONFIG_LSM workaround for 5.1+ kernels
meta-agl-profile-cluster-qt5: disable qtbase patches
zeus updates for dragonboard-410c
meta-security: activates dbus-cynagora
recipes-graphics/wayland/weston: Expose weston_output_damage()
meta-agl-profile-core: tweak udisks2 configuration for AGL
meta-agl-bsp/meta-arago: update weston bbappend
[RCAR] Update rcar driver weston 7 bsp 3.21.0
[RCAR] Update rcar driver weston 7 bsp 3.21.0
[RCAR] Split ADSP path for ulcb and ulcb-kf
Fix nss-localuser post install
meta-agl-bsp: meta-raspberrypi: handle zeus upgrade
meta-agl-profile-core: add patch for systemd-udevd SECLABEL crash
meta-security: disable dbus-cynara patches
meta-agl-bsp: handle ptest-runner upgrade
meta-agl-distro: Add inc file for next branch over-rides
meta-agl-distro: BBMASK problematic upstream meta-security bbappend
meta-agl-distro: prefer linux-yocto 4.19 LTS kernel
meta-agl-profile-graphical-qt5: enable qt5location services
meta-agl-profile-core: update most recipe
meta-agl-profile-core: update neardal recipe
Update base local.conf.sample
meta-agl-profile-graphical: don't always build agl-compositor
meta-agl-profile-graphical: update weston and weston-init
meta-agl-profile-graphical: update wayland-ivi-extension for weston 7.0.0
meta-agl-distro: add polkit to DISTRO_FEATURES
meta-agl-profile-core: update fontconfig bbappend
meta-agl-profile-core: switch to udisks2
meta-security: handle systemd upgrade
meta-agl-profile-graphical-qt5: handle qtwayland upgrade
meta-agl-profile-core: handle freetype upgrade
meta-agl-bsp meta-agl-profile-core: upgrade to opencv 4.x
meta-agl-profile-core: update rtl-sdr recipe for zeus
meta-security meta-app-framework: handle xmlsec1 upgrade
meta-agl-profile-graphical: upgrade to gstreamer 1.16
meta-agl-profile-core: remove libmicrohttpd backport
meta-agl-profile-core: remove backported curl and nghttp2 recipes
meta-agl-profile-core: remove libnfc recipe
meta-agl-profile-core: remove connman backport
meta-agl-profile-graphical: remove weston 5.0.0 patches
meta-agl-profile-core: remove old glibc patch
meta-agl-bsp/meta-intel: remove linux-firmware_git.bbappend
meta-agl-bsp: remove weston and wayland-protocols backports
meta-app-framework: remove libzip recipe
meta-security: remove keyutils recipe
Declare layer compatibility with zeus
Change-Id: Ie8ee1e37958279e7cf2d503c54ffacb46ba0c31c
Diffstat (limited to 'meta-agl-profile-core/recipes-support/udisks')
6 files changed, 32 insertions, 72 deletions
diff --git a/meta-agl-profile-core/recipes-support/udisks/files/99-udisks2.rules b/meta-agl-profile-core/recipes-support/udisks/files/99-udisks2.rules new file mode 100644 index 000000000..996e43439 --- /dev/null +++ b/meta-agl-profile-core/recipes-support/udisks/files/99-udisks2.rules @@ -0,0 +1,5 @@ +# UDISKS_FILESYSTEM_SHARED +# ==1: mount filesystem to a shared directory (/media/VolumeName) +# ==0: mount filesystem to a private directory (/run/media/$USER/VolumeName) +# See udisks(8) +ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="1" diff --git a/meta-agl-profile-core/recipes-support/udisks/files/automount.service b/meta-agl-profile-core/recipes-support/udisks/files/automount.service index 64c36e76b..b16515196 100644 --- a/meta-agl-profile-core/recipes-support/udisks/files/automount.service +++ b/meta-agl-profile-core/recipes-support/udisks/files/automount.service @@ -1,6 +1,6 @@ [Unit] Description=Automount Disk Manager -After=udisks.service +After=udisks2.service [Service] ExecStart=/usr/libexec/automount.sh diff --git a/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf b/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf deleted file mode 100644 index 0098b94e1..000000000 --- a/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- --> - -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <!-- Only root can own the service --> - <policy user="root"> - <allow own="org.freedesktop.UDisks"/> - </policy> - - <policy context="default"> - <allow send_destination="org.freedesktop.UDisks"/> - - <allow send_destination="org.freedesktop.UDisks" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.freedesktop.UDisks" - send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_destination="org.freedesktop.UDisks" - send_interface="org.freedesktop.UDisks"/> - <allow send_destination="org.freedesktop.UDisks" - send_interface="org.freedesktop.UDisks.Device"/> - <allow send_destination="org.freedesktop.UDisks" - send_interface="org.freedesktop.UDisks.Adapter"/> - <allow send_destination="org.freedesktop.UDisks" - send_interface="org.freedesktop.UDisks.Expander"/> - <allow send_destination="org.freedesktop.UDisks" - send_interface="org.freedesktop.UDisks.Port"/> - <allow receive_sender="org.freedesktop.UDisks" receive_type="signal" - receive_interface="org.freedesktop.UDisks"/> - </policy> -</busconfig> diff --git a/meta-agl-profile-core/recipes-support/udisks/files/udisks.service b/meta-agl-profile-core/recipes-support/udisks/files/udisks.service deleted file mode 100644 index 4bd558449..000000000 --- a/meta-agl-profile-core/recipes-support/udisks/files/udisks.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Disk Manager (legacy version) -Documentation=man:udisks(7) - -[Service] -Type=dbus -BusName=org.freedesktop.UDisks -ExecStart=/usr/libexec/udisks-daemon --no-debug - -[Install] -WantedBy=multi-user.target diff --git a/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend b/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend new file mode 100644 index 000000000..34756f480 --- /dev/null +++ b/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend @@ -0,0 +1,26 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://automount.service \ + file://automount.sh \ + file://99-udisks2.rules \ +" + +SYSTEMD_AUTO_ENABLE = "enable" +SYSTEMD_SERVICE_${PN} += "automount.service" + +do_install_append () { + sed -i 's/^WantedBy=.*/WantedBy=multi-user.target/' ${D}${systemd_unitdir}/system/udisks2.service + + install -d ${D}${base_libdir}/systemd/system + install -m 0644 ${WORKDIR}/automount.service ${D}${systemd_unitdir}/system + + install -d ${D}${libexecdir} + install -m 0755 ${WORKDIR}/automount.sh ${D}${libexecdir}/automount.sh + + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-udisks2.rules ${D}${sysconfdir}/udev/rules.d +} + +FILES_${PN} += "${base_libdir}/systemd/system/automount.service \ + ${libexecdir}/automount.sh \ +" diff --git a/meta-agl-profile-core/recipes-support/udisks/udisks_1.0.5.bbappend b/meta-agl-profile-core/recipes-support/udisks/udisks_1.0.5.bbappend deleted file mode 100644 index d55a167a6..000000000 --- a/meta-agl-profile-core/recipes-support/udisks/udisks_1.0.5.bbappend +++ /dev/null @@ -1,28 +0,0 @@ -SRC_URI += "file://org.freedesktop.UDisks.conf \ - file://udisks.service \ - file://automount.service \ - file://automount.sh \ - " -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -FILES_${PN} += "${base_libdir}/systemd/system/automount.service \ - ${base_libdir}/systemd/system/udisks.service \ - ${libexecdir}/automount.sh \ - " - -SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE_${PN} = "udisks.service automount.service" - -do_install_append () { - install -d ${D}${sysconfdir}/dbus-1/system.d - install -m 644 ${WORKDIR}/org.freedesktop.UDisks.conf ${D}${sysconfdir}/dbus-1/system.d/ - - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/udisks.service ${D}${base_libdir}/systemd/system - - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/automount.service ${D}${base_libdir}/systemd/system - - install -d ${D}${libexecdir} - install -m 0755 ${WORKDIR}/automount.sh ${D}${libexecdir}/automount.sh -} |