[meta-freescale] [meta-fsl-arm][PATCH] linux-mfgtool: Prevent overwriting linux-imx deployments

[Sven Ebenfeld]

When I try building fsl-image-mfgtool-initramfs it builds both,
linux-imx and linux-mfgtool. Both recipes are trying to write
the README... file and KERNEL_IMAGETYPE-file into deploy dir.
This leads to an error, that one recipe wants to write files that
already exist. This patch prevents linux-mfgtool from overwriting
linux-imx's results.

Signed-off-by: Sven Ebenfeld <sven.ebenfeld at gmail.com>
---
 recipes-kernel/linux/linux-mfgtool.inc | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/recipes-kernel/linux/linux-mfgtool.inc b/recipes-kernel/linux/linux-mfgtool.inc
index 106a7d9..eaccb44 100644
--- a/recipes-kernel/linux/linux-mfgtool.inc
+++ b/recipes-kernel/linux/linux-mfgtool.inc
@@ -79,3 +79,29 @@ do_install_append() {
 sysroot_stage_all() {
     :
 }
+
+# FIXME: Overwrite kernel_do_deploy as it tries to overwrite (u/z)Image symlink
+#        and DO_NOT...DELETE.txt file. This leads to an error that this recipe
+#        is trying to install files into an area where those files already exist.
+kernel_do_deploy() {
+	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+	if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
+		mkdir -p ${D}/lib
+		tar -cvzf ${DEPLOYDIR}/${MODULE_TARBALL_BASE_NAME} -C ${D} lib
+		ln -sf ${MODULE_TARBALL_BASE_NAME} ${DEPLOYDIR}/${MODULE_TARBALL_SYMLINK_NAME}
+	fi
+
+	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
+	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/mfgtool-${KERNEL_IMAGETYPE}
+
+	cd ${B}
+	# Update deploy directory
+	if [ -e "${KERNEL_OUTPUT}.initramfs" ]; then
+		echo "Copying deploy kernel-initramfs image and setting up links..."
+		initramfs_base_name=${INITRAMFS_BASE_NAME}
+		initramfs_symlink_name=mfgtool-${KERNEL_IMAGETYPE}-initramfs-${MACHINE}
+		install -m 0644 ${KERNEL_OUTPUT}.initramfs ${DEPLOYDIR}/${initramfs_base_name}.bin
+		cd ${DEPLOYDIR}
+		ln -sf ${initramfs_base_name}.bin ${initramfs_symlink_name}.bin
+	fi
+}
-- 
1.8.1.rc3