diff options
| author | Anibal Limon <anibal.limon@linaro.org> | 2020-02-05 23:46:38 +0000 |
|---|---|---|
| committer | Anibal Limon <anibal.limon@linaro.org> | 2020-02-05 23:46:38 +0000 |
| commit | c30a13608a5644f81923a844180ef592cdf3bf83 (patch) | |
| tree | 5f167791048f7f331b0ea242f9da0be4813cc090 /rpb-openembedded | |
| parent | 7d07be77d89d11089ebca25c58c276b9f9ea0f2b (diff) | |
Revert "rpb-openembedded/builders.sh: Use newer img2simg instead ext2img"
This reverts commit 7d07be77d89d11089ebca25c58c276b9f9ea0f2b.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I47f61cef83da6bbb92ceca3885ac54abb26a759a
Diffstat (limited to 'rpb-openembedded')
| -rwxr-xr-x | rpb-openembedded/builders.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rpb-openembedded/builders.sh b/rpb-openembedded/builders.sh index f4e8a70a..bf465bda 100755 --- a/rpb-openembedded/builders.sh +++ b/rpb-openembedded/builders.sh @@ -20,7 +20,7 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then 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 img2simg e2fsprogs" +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" 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,8 +147,7 @@ case "${MACHINE}" in *) for rootfs in $(find ${DEPLOY_DIR_IMAGE} -type f -name *.rootfs.ext4.gz); do pigz -d -k ${rootfs} - sudo e2fsck -y -f ${rootfs%.gz} - sudo img2simg ${rootfs%.gz} ${rootfs%.ext4.gz}.img + sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img rm -f ${rootfs%.gz} pigz -9 ${rootfs%.ext4.gz}.img done |