[ptxdist] [PATCH 0/2] Conditional switch for feature libmount in glib

[ptxdist] [PATCH 0/2] Conditional switch for feature libmount in glib

[Gavin Schenk]

This series fixes a bug where RAUC tries to mount already mounted filesystem.

In case of the error The journal shows messages like:
rauc[143]: mount: /run/rauc/rootfs.1: /dev/mmcblk0p3 already mounted on /.
rauc[143]: Failed to mount slot /dev/mmcblk0p3: failed to mount slot: failed to run mount: Child process exited with code 32

Enrico Jörns supported me with debugging and figured out, that an option for enabling glib libmount support when using RAUC is an urgent
candidate for PTXdist upstream.


Gavin Schenk (2):
  glib: Add switch to enable feature libmount in glib
  rauc: Add dependency to GLIB_LIBMOUNT

 rules/glib.in   | 8 ++++++++
 rules/glib.make | 2 +-
 rules/rauc.in   | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

-- 
2.20.1


-- 
Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636
http://www.eckelmann.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/2] glib: Add switch to enable feature libmount in glib

[Gavin Schenk]

Introduce a new switch GLIB_LIBMOUNT, that optionally enables feature libmount in glib

Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
---
 rules/glib.in   | 8 ++++++++
 rules/glib.make | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/rules/glib.in b/rules/glib.in
index ddc4625cd..fca978ddd 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -14,6 +14,8 @@ menuconfig GLIB
 	select HOST_GTK_DOC
 	select ICONV
 	select ZLIB
+	select UTIL_LINUX_NG if GLIB_LIBMOUNT
+	select UTIL_LINUX_NG_LIBMOUNT if GLIB_LIBMOUNT
 	help
 	  GLib is a library containing many useful C routines for things
 	  such as trees, hashes, lists, and strings. It is a useful
@@ -29,4 +31,10 @@ config GLIB_GDBUS
 	  gdbus is a command line dbus tool, based on the glib internal gdbus
 	  implementation.
 
+config GLIB_LIBMOUNT
+	bool
+	prompt "enable libmount
+	help
+	  Enable libmount in glib
+
 endif
diff --git a/rules/glib.make b/rules/glib.make
index 1bbb19b6e..600b9ff53 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -70,7 +70,7 @@ GLIB_CONF_OPT	:= \
 	--disable-fam \
 	--disable-xattr \
 	--disable-libelf \
-	--disable-libmount \
+	--$(call ptx/endis, PTXCONF_GLIB_LIBMOUNT)-libmount \
 	--disable-gtk-doc \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
-- 
2.20.1


-- 
Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636
http://www.eckelmann.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] rauc: Add dependency to GLIB_LIBMOUNT

[Gavin Schenk]

On systems showing /dev/root for the root node in /proc/mounts instead of a
real device, RAUC tries to mount an already mounted device when using
glib without feature libmount enabled.

Using feature libmount in glib fixes this.

Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
---
 rules/rauc.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/rauc.in b/rules/rauc.in
index 0de8c1599..8c94710f9 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -5,6 +5,7 @@ menuconfig RAUC
 	prompt "Rauc Update Tool              "
 	select OPENSSL
 	select GLIB
+	select GLIB_LIBMOUNT
 	select HOST_GLIB
 	select BUSYBOX_FEATURE_TAR_LONG_OPTIONS if BUSYBOX_TAR
 	select LIBCURL				if RAUC_NETWORK
-- 
2.20.1


-- 
Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636
http://www.eckelmann.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de