diff options
| author | Aníbal Limón <anibal.limon@linaro.org> | 2020-02-06 10:27:08 -0600 |
|---|---|---|
| committer | Anibal Limon <anibal.limon@linaro.org> | 2020-02-06 16:31:26 +0000 |
| commit | 2798029ae4a2772c9b51efc329926211afda0804 (patch) | |
| tree | 81063882e2de77e33e45f8933a535850e1f68ca3 | |
| parent | c1c282e1e9b932b879e73a226afb32837fbedcd1 (diff) | |
rpb-openembedded/builders.sh: Use img2simg only on Debian buster
The ext2simg tool in some cases causes corruption on rootfs images, so
use newer img2simg when builder is debian buster.
This workaround using label is while RPB users switch CI jobs to Debian buster.
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Change-Id: Ia420ae8708c242316bee9b85c1543ac3c630427b
| -rwxr-xr-x | rpb-openembedded/builders.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/rpb-openembedded/builders.sh b/rpb-openembedded/builders.sh index 9549d1a936..e952b1648f 100755 --- a/rpb-openembedded/builders.sh +++ b/rpb-openembedded/builders.sh @@ -15,12 +15,22 @@ cleanup_exit() echo "Running cleanup_exit..." } +# XXX: In Debian buster use newer tool img2simg because in certain cases ext2img corrupt rootfs images, +# this workaround is meanwhile all RPB builds are switch to use Debian buster. +if [ "$label" == "docker-buster-amd64" ]; then + android_tools="img2simg" + simg_cmd="img2simg" +else + android_tools="android-tools-fsutils" + simg_cmd="ext2simg -v" +fi + if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then echo "INFO: apt update error - try again in a moment" sleep 15 sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true fi -pkg_list="python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail pigz" +pkg_list="python-pip $android_tools chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail pigz" if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then echo "INFO: apt install error - try again in a moment" sleep 15 @@ -147,7 +157,7 @@ case "${MACHINE}" in *) for rootfs in $(find ${DEPLOY_DIR_IMAGE} -type f -name *.rootfs.ext4.gz); do pigz -d -k ${rootfs} - sudo img2simg ${rootfs%.gz} ${rootfs%.ext4.gz}.img + sudo $simg_cmd ${rootfs%.gz} ${rootfs%.ext4.gz}.img rm -f ${rootfs%.gz} pigz -9 ${rootfs%.ext4.gz}.img done |