mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 06:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

smdk-dltool: Produce correct return code in event of error

Browse Source 
At present if a download fails, we don't report this in the return code.
This means there is no indication of failure to cros_bundle_firmware.

Correct the return code in this case, with a new patch.

BUG=chrome-os-partner:9633
TEST=manual:
$ cros_bundle_firmware -b daisy -w usb --bl1 <fname>
where fname is an old BL1 which breaks USB download.
See that the failure to download BL2 is now reported and
cros_bundle_firmware stops with an error.

Change-Id: I3bb966bf3c1a9009cfba4064da872a8dd8cb6043
Reviewed-on: https://gerrit.chromium.org/gerrit/23145
Reviewed-by: Doug Anderson <dianders@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Mike Frysinger 2012-05-22 11:23:24 -04:00 committed by Gerrit
parent 4deee65ad5
commit 59b7204448
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch vendored
View File

@ -136,7 +136,7 @@ migrate to libusb-1 by me (Mike Frysinger)
DBG(("option index %d\n",c ));
@@ -218,117 +243,125 @@ int main(int argc, char **argv)
@@ -218,117 +243,127 @@ int main(int argc, char **argv)
break;
case 'b':
@ -320,7 +320,9 @@ migrate to libusb-1 by me (Mike Frysinger)
- if (ret != dl_size) {
- printf("failed to write %ld bytes\n", dl_size);
+ if (ret || transferred != dl_size) {
+ printf("failed to write %ld bytes (wrote %d)\n", dl_size, transferred);
+ printf("failed to write %ld bytes (wrote %d): %s\n",
+ dl_size, transferred, strerror(errno));
+ ret = 1;
}
free(dl_data);
@ -331,5 +333,6 @@ migrate to libusb-1 by me (Mike Frysinger)
+ libusb_close(devh);
+ libusb_exit(ctx);
return 0;
- return 0;
+ return ret;
}

2
sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild → sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild vendored
View File

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild,v 1.1 2012/02/09 17:15:11 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild,v 1.1 2012/05/22 02:23:46 vapier Exp $
EAPI="4"

2
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r2 → sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r3 vendored
View File

@ -9,4 +9,4 @@ RDEPEND=virtual/libusb:1
SLOT=0
SRC_URI=http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v0.20.tar.gz
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
_md5_=5e0cdde7c88931fa50e0b3a5c490557b
_md5_=ec9d18d713ced50fe9a6893cc7a29d7f