From 52400c209df4d9e2db9277cfd670b4ff9e893a23 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 30 Sep 2019 22:35:02 +0200
Subject: [PATCH] - vu+: fix mounting boot partition

---
 make/bootstrap.mk              | 4 +++-
 make/environment-linux.mk      | 8 ++++++++
 skel-root/vuplus/etc/mdev.conf | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 469b28b3..8b708c25 100644
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -35,10 +35,12 @@ ifneq ($(wildcard $(SKEL-ROOT)-$(BOXFAMILY)),)
 endif
 	find $(TARGET_DIR) -type f -print0 | xargs --no-run-if-empty -0 \
 		sed -i 's|%(BOXMODEL)|$(BOXMODEL)|'
+	sed -i 's|%(BOOT_PARTITION)|$(BOOT_PARTITION)|' $(TARGET_DIR)/etc/mdev.conf
+
 
 target-dir:
 	mkdir -p $(TARGET_DIR)
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k))
 	mkdir -p $(TARGET_DIR)/boot
 endif
 	mkdir -p $(TARGET_DIR)/dev
diff --git a/make/environment-linux.mk b/make/environment-linux.mk
index 78448504..1b1381c7 100644
--- a/make/environment-linux.mk
+++ b/make/environment-linux.mk
@@ -54,6 +54,8 @@ else ifeq ($(BOXFAMILY), bcm7376)
   VMLINUZ_INITRD_URL    = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
   VMLINUZ_INITRD        = vmlinuz-initrd-7366c0
 
+  BOOT_PARTITION = 1
+
 # arm-vuduo4k
 else ifeq ($(BOXFAMILY), bcm7278)
   KERNEL_VER    = 4.1.45-1.17
@@ -71,6 +73,8 @@ else ifeq ($(BOXFAMILY), bcm7278)
   VMLINUZ_INITRD_URL    = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
   VMLINUZ_INITRD        = vmlinuz-initrd-7278b1
 
+  BOOT_PARTITION = 1
+
 # arm-vuultimo4k
 else ifeq ($(BOXFAMILY), bcm7444s)
   KERNEL_VER    = 3.14.28-1.12
@@ -88,6 +92,8 @@ else ifeq ($(BOXFAMILY), bcm7444s)
   VMLINUZ_INITRD_URL    = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
   VMLINUZ_INITRD        = vmlinuz-initrd-7445d0
 
+  BOOT_PARTITION = 1
+
 # arm-vuzero4k
 else ifeq ($(BOXFAMILY), bcm72604)
   KERNEL_VER    = 4.1.20-1.9
@@ -105,6 +111,8 @@ else ifeq ($(BOXFAMILY), bcm72604)
   VMLINUZ_INITRD_URL    = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
   VMLINUZ_INITRD        = vmlinuz-initrd-7260a0
 
+  BOOT_PARTITION = 4
+
 # mips-vuduo
 else ifeq ($(BOXFAMILY), bcm7335)
   KERNEL_VER    = 3.9.6
diff --git a/skel-root/vuplus/etc/mdev.conf b/skel-root/vuplus/etc/mdev.conf
index fee2ee87..44c65d29 100644
--- a/skel-root/vuplus/etc/mdev.conf
+++ b/skel-root/vuplus/etc/mdev.conf
@@ -76,7 +76,7 @@ fp0			root:root	0660	=dbox/fp0
 # Disc devices
 sr[0-9]			root:root	0664	*/lib/mdev/fs/mdev-mount
 # Memory cards / eMMC-Partitions
-mmcblk0p1		root:root	0664	@mount -t vfat /dev/$MDEV /boot 2>&1 >/dev/null
+mmcblk0p%(BOOT_PARTITION)		root:root	0664	@mount -t vfat /dev/$MDEV /boot 2>&1 >/dev/null
 mmcblk[0-9]p[0-9]	root:root	0664	*/lib/mdev/fs/mdev-mmcblk
 
 # WLAN devices