diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2015-03-27 20:38:40 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2015-03-27 20:38:40 +0200 |
| commit | 03bfd163730e3b6102e9ca8e87730515b8d36d8a (patch) | |
| tree | 7e23335961729c8cec7a5c3b710dd35b37d1a3e4 | |
| parent | bce6411eddef26919448ca6500b012b9384c4802 (diff) | |
96boards-hikey: remove hardcoded device for kpartx
Parse kpartx output to figure out the device maps.
It fixes build failures when a parallel build is happening and both
assumed access to loop0 device.
Change-Id: I107b7bd82d5fd9dc0056a2b11acf405ac197a8cf
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
| -rw-r--r-- | 96boards-hikey.yaml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/96boards-hikey.yaml b/96boards-hikey.yaml index 55c8b94..e0a41f6 100644 --- a/96boards-hikey.yaml +++ b/96boards-hikey.yaml @@ -49,6 +49,7 @@ cleanup_exit() { cd ${WORKSPACE} + sudo kpartx -dv out/hikey-jessie_*-${BUILD_NUMBER}.img || true rm -rf lci-build-tools rm -rf builddir* rm -rf out @@ -148,9 +149,11 @@ # Create eMMC rootfs image(s) mkdir boot rootfs - sudo kpartx -av out/hikey-jessie_${rootfs}_`date +%Y%m%d`-${BUILD_NUMBER}.img - sudo mount -o loop /dev/mapper/loop0p1 boot - sudo mount -o loop /dev/mapper/loop0p2 rootfs + for device in `sudo kpartx -av out/hikey-jessie_${rootfs}_`date +%Y%m%d`-${BUILD_NUMBER}.img | cut -d' ' -f3`; do + partition=`echo ${device} | cut -d'p' -f3` + [ "${partition}" = "1" ] && sudo mount -o loop /dev/mapper/${device} boot + [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs + done sudo cp -a boot/hi6220-hikey.dtb boot/lcb.dtb || true sudo cp -a boot/initrd.img-* boot/ramdisk.img || true |