Merge branch 'vs/mtcap3' into 'mpower-dev-nxp'

Vs/mtcap3

See merge request !57

5 files changed, 14 insertions, 20 deletions

diff --git a/recipes-core/base-files/fstab-ubifs/fstab b/recipes-core/base-files/fstab-ubifs/fstab
index 8cca798..4560bb3 100644
--- a/recipes-core/base-files/fstab-ubifs/fstab
+++ b/recipes-core/base-files/fstab-ubifs/fstab
@@ -6,5 +6,5 @@ tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,stri
 tmpfs                /var/volatile        tmpfs      defaults              0  0
 configfs             /sys/kernel/config   configfs   defaults              0  0
 
-ubi0:config          /var/config          ubifs      defaults              0  0
-ubi0:oem             /var/oem             ubifs      defaults,ro           0  0
+ubi0:config1         /var/config          ubifs      defaults              0  0
+ubi0:oem1            /var/oem             ubifs      defaults,ro           0  0
diff --git a/recipes-core/base-files/fstab-ubifs_1.0.bb b/recipes-core/base-files/fstab-ubifs_1.0.bb
index cd2102a..533293a 100644
--- a/recipes-core/base-files/fstab-ubifs_1.0.bb
+++ b/recipes-core/base-files/fstab-ubifs_1.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 inherit allarch
-PR = "r1"
+PR = "r2"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 PROVIDES = "fstab"
 DEPENDS = "base-files"
diff --git a/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init b/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init
index 7fc7f7e..0000f29 100644
--- a/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init
+++ b/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init
@@ -128,25 +128,8 @@ do_rw_mount() {
     done
 }
 
-
-TMP=/var/volatile
-# Set the suffix number in /var/oem and /var/config to match root
-fix_volume_names() {
-    if ! [[ $(cat /proc/cmdline) =~ root=ubi0:rootfs([0-9]+) ]] ; then
-        loginfo "Cannot find root=ubi0:rootfs in /proc/cmdline"
-    fi
-    vol_suffix=${BASH_REMATCH[1]}
-    echo $vol_suffix
-    sed -r "s/(ubi0:(oem|config))([0-9]*)/\1${vol_suffix}/" /etc/fstab >${TMP}/fstab
-    if ! cmp ${TMP}/fstab /etc/fstab ; then
-	    loginfo "Updating fstab with new volume names"
-            cp ${TMP}/fstab /etc/fstab
-    fi
-}
-
 do_start() {
     do_rw_mount
-    fix_volume_names
 }
 
 case $1 in
diff --git a/recipes-core/udev/eudev/ubi.rules b/recipes-core/udev/eudev/ubi.rules
new file mode 100644
index 0000000..f681e27
--- /dev/null
+++ b/recipes-core/udev/eudev/ubi.rules
@@ -0,0 +1,7 @@
+SUBSYSTEM!="ubi", GOTO="ubi_end"
+# only ubi devices
+KERNEL!="ubi*", GOTO="ubi_end"
+
+SUBSYSTEM=="ubi", KERNEL=="ubi*_*", SYMLINK+="ubi_%s{name}"
+
+LABEL="ubi_end"
diff --git a/recipes-core/udev/eudev_%.bbappend b/recipes-core/udev/eudev_%.bbappend
index 364288e..539cfb2 100644
--- a/recipes-core/udev/eudev_%.bbappend
+++ b/recipes-core/udev/eudev_%.bbappend
@@ -6,6 +6,7 @@ PR .= ".mlinux7"
 # add custom rules for persistent modem device names
 SRC_URI += "file://cellular_radios.rules \
             file://cellular_radios.sh \
+            file://ubi.rules \
             file://${MACHINE}.rules"
 
 do_install_append() {
@@ -15,4 +16,7 @@ do_install_append() {
     install -m 755 ${WORKDIR}/cellular_radios.sh ${D}${sysconfdir}/udev/scripts/
 }
 
+do_install_append_mtcap3() {
+    install -m 644 ${WORKDIR}/ubi.rules ${D}${sysconfdir}/udev/rules.d/
+}