From 77d18f8aeb198eb71b943910c9fb539126af4736 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 22 May 2012 02:23:53 +0000 Subject: Patch by Simon Glass to exit with non-zero value when things fail. (Portage version: 2.2.0_alpha102/cvs/Linux x86_64) --- dev-embedded/smdk-dltool/ChangeLog | 8 ++++- .../files/smdk-dltool-0.20-libusb-1.0.patch | 9 ++++-- .../smdk-dltool/smdk-dltool-0.20-r2.ebuild | 34 ---------------------- .../smdk-dltool/smdk-dltool-0.20-r3.ebuild | 34 ++++++++++++++++++++++ 4 files changed, 47 insertions(+), 38 deletions(-) delete mode 100644 dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild create mode 100644 dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild (limited to 'dev-embedded') 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 +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-r2.ebuild deleted file mode 100644 index 8fe8138dbd04..000000000000 --- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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 $ - -EAPI="4" - -inherit toolchain-funcs eutils - -DESCRIPTION="Tool to communicate with Samsung SMDK boards" -HOMEPAGE="http://www.fluff.org/ben/smdk/tools/" -SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz" - -# Email sent to author on 2012-01-18 querying about license -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="virtual/libusb:1" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool - -src_prepare() { - epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-libusb-1.0.patch - tc-export CC PKG_CONFIG -} - -src_install() { - newbin dltool smdk-usbdl - dodoc readme.txt -} diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild new file mode 100644 index 000000000000..68bfe03daf9c --- /dev/null +++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild @@ -0,0 +1,34 @@ +# 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-r3.ebuild,v 1.1 2012/05/22 02:23:46 vapier Exp $ + +EAPI="4" + +inherit toolchain-funcs eutils + +DESCRIPTION="Tool to communicate with Samsung SMDK boards" +HOMEPAGE="http://www.fluff.org/ben/smdk/tools/" +SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz" + +# Email sent to author on 2012-01-18 querying about license +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="virtual/libusb:1" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool + +src_prepare() { + epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch + epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-libusb-1.0.patch + tc-export CC PKG_CONFIG +} + +src_install() { + newbin dltool smdk-usbdl + dodoc readme.txt +} -- cgit v1.2.3-65-gdbad