summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel A Fernandes <joelagnel@ti.com>2011-10-20 01:59:06 -0500
committerKoen Kooi <koen@dominion.thruhere.net>2011-10-20 09:19:40 +0200
commit9c078a61edeeb970f77e6d7a7a8cd09382bd27a4 (patch)
tree942e8c17bc12c2243a2cb669bae9ed468b52b8c5
parent36b38d4f48d8915b75750de9aaa816bba88aba51 (diff)
downloadmeta-ti-9c078a61edeeb970f77e6d7a7a8cd09382bd27a4.tar.gz
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 <joelagnel@ti.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--classes/sdcard_image.bbclass4
1 files changed, 3 insertions, 1 deletions
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 () {
92 suffix=bin 92 suffix=bin
93 fi 93 fi
94 94
95 cp -v ${IMAGE_ROOTFS}/boot/{user.txt,uEnv.txt} ${WORKDIR}/tmp-mnt-boot || true
96
95 if [ -e ${IMAGE_ROOTFS}/boot/u-boot.$suffix ] ; then 97 if [ -e ${IMAGE_ROOTFS}/boot/u-boot.$suffix ] ; then
96 cp -v ${IMAGE_ROOTFS}/boot/{u-boot.$suffix,user.txt,uEnv.txt} ${WORKDIR}/tmp-mnt-boot || true 98 cp -v ${IMAGE_ROOTFS}/boot/{u-boot.$suffix} ${WORKDIR}/tmp-mnt-boot || true
97 else 99 else
98 cp -v ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.$suffix ${WORKDIR}/tmp-mnt-boot/u-boot.$suffix 100 cp -v ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.$suffix ${WORKDIR}/tmp-mnt-boot/u-boot.$suffix
99 fi 101 fi