diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-30 19:41:35 +0000 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-08-06 14:18:54 +0100 |
commit | 9d0935c9bb1309431e62b8f8341eb503653e5ff5 (patch) | |
tree | 73355c3c463acddc63107fde9c022a3dfc8b3459 /recipes-connectivity | |
parent | 55345dfd419c133d55eb33c9e69ba286f42dbe6d (diff) | |
download | meta-raspberrypi-9d0935c9bb1309431e62b8f8341eb503653e5ff5.tar.gz |
sdcard_image-rpi.bbclass: use -v for all mcopy calls and add bbfatal in case mcopy fails
* I have this in our layer for some time:
RPI_KERNEL_DEVICETREE_OVERLAYS_append = " overlays/vc4-fkms-v3d.dtbo"
because we're using vc4graphics also on raspberrypi3 and it was
working fine until recently.
* now the default rpi-base.inc in warrior and master branch includes the same since:
https://github.com/agherzan/meta-raspberrypi/commit/37aa050d5a44eb797540ef50408c2ca8e3da6fa0
and do_image_rpi_sdimg started failing with a bit useless log:
...
Partition Table: msdos
Disk Flags:
Number Start End Size Type File system Flags
1 4194kB 46.1MB 41.9MB primary boot, lba
2 46.1MB 1145MB 1099MB primary
mkfs.fat: warning - lowercase labels might not work properly with DOS or
Windows
mkfs.fat 4.1 (2017-01-24)
WARNING: exit code 1 from a shell command.
* after adding -v to mcopy calls I got slightly better log:
...
Copying w1-gpio-pullup.dtbo
Copying w1-gpio.dtbo
WARNING: exit code 1 from a shell command.
* the issue is that mcopy behavior in non-interactive shell is to fail
when the target file already exists (sometimes it seems to cause mcopy
to hang forever), but when you execute the run.do_image_rpi_sdimg
script manually in interactive shell it will nicely show this prompt
on stderr:
$ dtb=vc4-fkms-v3d.dtbo recipe-sysroot-native/usr/bin/mcopy -i boot.img -s BUILD/deploy/images/raspberrypi3/$dtb ::overlays/$dtb
Long file name "vc4-fkms-v3d.dtbo" already exists.
a)utorename A)utorename-all r)ename R)ename-all o)verwrite O)verwrite-all
s)kip S)kip-all q)uit (aArRoOsSq): o
* with the bbfatal the log is finally a bit more useful:
...
Copying w1-gpio-pullup.dtbo
Copying w1-gpio.dtbo
ERROR: mcopy cannot copy TOPDIR/BUILD/deploy/images/raspberrypi3/vc4-fkms-v3d.dtbo into boot.img
WARNING: exit code 1 from a shell command.
* the only exception is FATPAYLOAD where it was ignoring mcopy with || true
before, I've added bbwarn, because even issues like mentioned there
"vfat issues like not supporting .~lock files" are probably worth
reporting as warning (why would people add .~lock to FATPAYLOAD if
it cannot be copied into boot.img)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-connectivity')
0 files changed, 0 insertions, 0 deletions