From 9c078a61edeeb970f77e6d7a7a8cd09382bd27a4 Mon Sep 17 00:00:00 2001 From: Joel A Fernandes Date: Thu, 20 Oct 2011 01:59:06 -0500 Subject: [PATCH] sdcard_image: Copy user.txt/uEnv.txt if it exists in /boot Fixed a bug where the U-boot environment files are not copied to the boot partition if they were installed in /boot by other recipes. We should copy the uEnv.txt and user.txt always without placing a condition for the presence of anything else in /boot. This is the original behavior of sdcard_image before the recent wave of changes to it. Signed-off-by: Joel A Fernandes Signed-off-by: Koen Kooi --- classes/sdcard_image.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/sdcard_image.bbclass b/classes/sdcard_image.bbclass index d7f48a80..2bbf4c47 100644 --- a/classes/sdcard_image.bbclass +++ b/classes/sdcard_image.bbclass @@ -92,8 +92,10 @@ IMAGE_CMD_sdimg () { suffix=bin fi + cp -v ${IMAGE_ROOTFS}/boot/{user.txt,uEnv.txt} ${WORKDIR}/tmp-mnt-boot || true + if [ -e ${IMAGE_ROOTFS}/boot/u-boot.$suffix ] ; then - cp -v ${IMAGE_ROOTFS}/boot/{u-boot.$suffix,user.txt,uEnv.txt} ${WORKDIR}/tmp-mnt-boot || true + cp -v ${IMAGE_ROOTFS}/boot/{u-boot.$suffix} ${WORKDIR}/tmp-mnt-boot || true else cp -v ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.$suffix ${WORKDIR}/tmp-mnt-boot/u-boot.$suffix fi