diff options
| author | John Klug <john.klug@multitech.com> | 2017-06-09 10:22:39 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2017-06-09 10:22:39 -0500 |
| commit | ca966936bec806fc5ed30b8af904a0e2398b7404 (patch) | |
| tree | b4757b38d4c53dd396972b969ab383785db70408 /classes | |
| parent | c23502dc821f6b7b17551e24d5287d8c8220fd26 (diff) | |
| parent | 140d44a8557acffbdda3d344c23a4e3481a3997a (diff) | |
| download | meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.tar.gz meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.tar.bz2 meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.zip | |
Merge yocto-2.2 (morty) into master
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/mlinux-image.bbclass | 12 | ||||
| -rw-r--r-- | classes/mlinux-mirrors.bbclass | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass index 4af7d9e..580901d 100644 --- a/classes/mlinux-image.bbclass +++ b/classes/mlinux-image.bbclass @@ -1,13 +1,15 @@ # 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 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;" @@ -58,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() { diff --git a/classes/mlinux-mirrors.bbclass b/classes/mlinux-mirrors.bbclass index 7f80d46..1e95651 100644 --- a/classes/mlinux-mirrors.bbclass +++ b/classes/mlinux-mirrors.bbclass @@ -6,7 +6,6 @@ hg://.*/.* http://multitech.net/mlinux/sources/ bzr://.*/.* http://multitech.net/mlinux/sources/ osc://.*/.* http://multitech.net/mlinux/sources/ p4://.*/.* http://multitech.net/mlinux/sources/ -svk://.*/.* http://multitech.net/mlinux/sources/ } MIRRORS_append () { |