summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-05-22 02:23:53 +0000
committerMike Frysinger <vapier@gentoo.org>2012-05-22 02:23:53 +0000
commit77d18f8aeb198eb71b943910c9fb539126af4736 (patch)
tree138021f9b2e0b5aea824db5bc4e2cc2068e8b97c
parentmarked x86 per bug 416263 (diff)
downloadgentoo-2-77d18f8aeb198eb71b943910c9fb539126af4736.tar.gz
gentoo-2-77d18f8aeb198eb71b943910c9fb539126af4736.tar.bz2
gentoo-2-77d18f8aeb198eb71b943910c9fb539126af4736.zip
Patch by Simon Glass to exit with non-zero value when things fail.
(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)
-rw-r--r--dev-embedded/smdk-dltool/ChangeLog8
-rw-r--r--dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch9
-rw-r--r--dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild (renamed from dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild)2
3 files changed, 14 insertions, 5 deletions
diff --git a/dev-embedded/smdk-dltool/ChangeLog b/dev-embedded/smdk-dltool/ChangeLog
index 047b699e5bd2..11600fbc68b2 100644
--- a/dev-embedded/smdk-dltool/ChangeLog
+++ b/dev-embedded/smdk-dltool/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-embedded/smdk-dltool
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/ChangeLog,v 1.5 2012/02/09 17:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/ChangeLog,v 1.6 2012/05/22 02:23:48 vapier Exp $
+
+*smdk-dltool-0.20-r3 (22 May 2012)
+
+ 22 May 2012; Mike Frysinger <vapier@gentoo.org> +smdk-dltool-0.20-r3.ebuild,
+ -smdk-dltool-0.20-r2.ebuild, files/smdk-dltool-0.20-libusb-1.0.patch:
+ Patch by Simon Glass to exit with non-zero value when things fail.
*smdk-dltool-0.20-r2 (09 Feb 2012)
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
index ee72106c8b85..889a439c7fb0 100644
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
+++ b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
@@ -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;
}
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
index 8fe8138dbd04..68bfe03daf9c 100644
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild
+++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
@@ -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"