[Buildroot] [git commit branch/next] package/udisks: add config option to support mounting in /media

[Thomas Petazzoni]

commit: https://git.buildroot.net/buildroot/commit/?id=3a96199ca1132dc75fbc20130fee40c2491d011a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next

Support mounting in /media instead of /run/media for compatibility
with the Filesystem Hierarchy Standard (FHS). This is also required
for backward compatibility with udisks1.

Signed-off-by: Wolfgang Grandegger <wg at grandegger.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
 package/udisks/Config.in | 10 ++++++++++
 package/udisks/udisks.mk |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index a3a0f82144..7def58c3a6 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -49,3 +49,13 @@ comment "udisks needs a toolchain with dynamic library, locale, wchar, threads,
 
 comment "udisks can't be built with Optimize for fast"
 	depends on BR2_OPTIMIZE_FAST
+
+if BR2_PACKAGE_UDISKS
+
+config BR2_PACKAGE_UDISKS_FHS_MEDIA
+	bool "Mount devices in /media instead of /run/media"
+	help
+	  Support mounting in /media for compatibility with the
+	  Filesystem Hierarchy Standard (FHS)
+
+endif
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index 959333d01f..840f552b04 100644
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -29,7 +29,6 @@ UDISKS_CONF_OPTS = \
 	--disable-acl \
 	--disable-bcache \
 	--disable-btrfs \
-	--disable-fhs-media \
 	--disable-introspection \
 	--disable-iscsi \
 	--disable-lsm \
@@ -40,4 +39,10 @@ UDISKS_CONF_OPTS = \
 	--disable-vdo \
 	--disable-zram
 
+ifeq ($(BR2_PACKAGE_UDISKS_FHS_MEDIA),y)
+UDISKS_CONF_OPTS += --enable-fhs-media
+else
+UDISKS_CONF_OPTS += --disable-fhs-media
+endif
+
 $(eval $(autotools-package))