From: Markham <markham001@gmx.de>
Date: Tue, 28 May 2019 07:12:57 +0000 (+0200)
Subject: busybox: add busybox-mount_single_uuid.patch
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=9b4396d4649861e5d56f7ea2b62c9b2f7564c9fa;p=bs-cst-neutrino-hd.git

busybox: add busybox-mount_single_uuid.patch
---

diff --git a/archive-patches/busybox-mount_single_uuid.patch b/archive-patches/busybox-mount_single_uuid.patch
new file mode 100644
index 0000000..3247877
--- /dev/null
+++ b/archive-patches/busybox-mount_single_uuid.patch
@@ -0,0 +1,12 @@
+--- a/util-linux/mount.c
++++ b/util-linux/mount.c
+@@ -2315,6 +2315,8 @@ int mount_main(int argc UNUSED_PARAM, ch
+ 		// "proc") or a full path from root
+ 		if (argv[0]) {
+ 
++			// Check for UUID= or LABEL= entries too
++			resolve_mount_spec(&mtcur->mnt_fsname);
+ 			// Is this what we're looking for?
+ 			if (strcmp(argv[0], mtcur->mnt_fsname) != 0
+ 			 && strcmp(storage_path, mtcur->mnt_fsname) != 0
+
diff --git a/make/applications.mk b/make/applications.mk
index f242d52..bca89d3 100755
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -47,16 +47,22 @@ BUSYBOX_MAKE_OPTS = \
 	EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 	CONFIG_PREFIX="$(TARGETPREFIX)"
 
+#
+# busybox_patches
+#
+BUSYBOX_PATCHES  = busybox-1.29.1-hack-init-s-console.patch
+BUSYBOX_PATCHES += busybox-1.29.1-changing-the-order-sys-tree.diff
+BUSYBOX_PATCHES += busybox-1.29.1-mdev.diff
+BUSYBOX_PATCHES += busybox-1.29.1-unicode.patch
+BUSYBOX_PATCHES += busybox-1.29.1-flashcp-small-output.patch
+BUSYBOX_PATCHES += busybox-mount_single_uuid.patch
+
 $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX)
 	$(START_BUILD)
 	$(REMOVE)/busybox-$(BUSYBOX_VER)
 	$(UNTAR)/busybox-$(BUSYBOX_VER).tar.bz2
 	pushd $(BUILD_TMP)/busybox-$(BUSYBOX_VER) && \
-		$(PATCH)/busybox-1.29.1-hack-init-s-console.patch; \
-		$(PATCH)/busybox-1.29.1-changing-the-order-sys-tree.diff; \
-		$(PATCH)/busybox-1.29.1-mdev.diff; \
-		$(PATCH)/busybox-1.29.1-unicode.patch; \
-		$(PATCH)/busybox-1.29.1-flashcp-small-output.patch; \
+		$(call apply_patches, $(BUSYBOX_PATCHES)); \
 		cp $(PATCHES)/busybox-1.30.1-cst.config .config && \
 		$(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS) && \
 		$(BUSYBOX_MAKE_ENV) $(MAKE) install $(BUSYBOX_MAKE_OPTS)