From 2db010b3b63c58fb966b44cb8df0b16dd913469f Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Thu, 9 Mar 2017 14:27:42 -0600
Subject: Fix build where do_rootfs wasn't done before do_firmware tried to
 copy rootfs file

---
 classes/mlinux-image.bbclass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'classes/mlinux-image.bbclass')

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 4af7d9e..785160e 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -44,6 +44,7 @@ do_firmware () {
     cp at91bootstrap_pmecc_padded.bin bstrap.bin
     cp u-boot-${MACHINE}.bin uboot.bin
     cp uImage-${MACHINE}.bin uImage.bin
+    sleep 30
     cp ${IMAGE_BASENAME}-${MACHINE}.jffs2 rootfs.jffs2
 
     cat bstrap.bin | md5sum > bstrap.bin.md5
-- 
cgit v1.2.3


From 00ce6692fd0287c15b7f6e5aa25fa66eb2221971 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 21 Apr 2017 10:35:44 -0500
Subject: mtadm user, root password removed, sudo

---
 classes/mlinux-image.bbclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'classes/mlinux-image.bbclass')

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 785160e..3c3bcaa 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -2,12 +2,14 @@
 # having file mod times of zero confuses cron
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
-# set specified root password in image using ROOT_PASSWORD_HASH
+# set specified mtadm password in image using ROOT_PASSWORD_HASH
 mlinux_set_root_password () {
+    echo IMAGE_ROOTFS is ${IMAGE_ROOTFS} >/tmp/m_set_root_pwd.txt
+    ls ${IMAGE_ROOTFS} >/tmp/ls_pwd.txt
     if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then
-        sed -i 's%^root:[^:]*:%root:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/shadow
+        sed -i 's%^mtadm:[^:]*:%mtadm:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/shadow
     elif [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
-        sed -i 's%^root:[^:]*:%root:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/passwd
+        sed -i 's%^mtadm:[^:]*:%mtadm:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/passwd
     fi
 }
 ROOTFS_POSTPROCESS_COMMAND += "mlinux_set_root_password;"
-- 
cgit v1.2.3


From aed2676069931f42b7f50d243d36048d05a5ed58 Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Tue, 9 May 2017 13:34:07 -0500
Subject: Fix build to run do_firmware after do_image_complete so that rootfs
 jffs2 file has been created before trying to copy it

---
 classes/mlinux-image.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'classes/mlinux-image.bbclass')

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 3c3bcaa..df31a39 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -46,7 +46,6 @@ do_firmware () {
     cp at91bootstrap_pmecc_padded.bin bstrap.bin
     cp u-boot-${MACHINE}.bin uboot.bin
     cp uImage-${MACHINE}.bin uImage.bin
-    sleep 30
     cp ${IMAGE_BASENAME}-${MACHINE}.jffs2 rootfs.jffs2
 
     cat bstrap.bin | md5sum > bstrap.bin.md5
@@ -61,7 +60,7 @@ do_firmware () {
     rm -f bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
 }
 
-addtask firmware after do_rootfs before do_build
+addtask firmware after do_image_complete before do_build
 
 # make links to images in TFTPBOOT_DIR for ease of development
 do_tftpboot_links() {
-- 
cgit v1.2.3


From d1cda173c40be99def22edabe1b19a20a610fc68 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 16 May 2017 12:59:44 -0500
Subject: Update mkfs.jffs2 MTS command update to match Morty

---
 classes/mlinux-image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/mlinux-image.bbclass')

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index df31a39..580901d 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -1,6 +1,6 @@
 # redefine mkfs.jffs2 command and remove --faketime option so we get non-zero file times
 # having file mod times of zero confuses cron
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}"
 
 # set specified mtadm password in image using ROOT_PASSWORD_HASH
 mlinux_set_root_password () {
-- 
cgit v1.2.3