From 40d7080fd62f996c2887e56885e4bad91bd2de85 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. Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64 --- dev-embedded/smdk-dltool/ChangeLog | 8 ++++- dev-embedded/smdk-dltool/Manifest | 34 +++++++++++----------- .../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 ++++++++++++++++++++++ 5 files changed, 64 insertions(+), 55 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/Manifest b/dev-embedded/smdk-dltool/Manifest index 675e4a3d71dc..600ae3db8bae 100644 --- a/dev-embedded/smdk-dltool/Manifest +++ b/dev-embedded/smdk-dltool/Manifest @@ -3,25 +3,25 @@ Hash: SHA1 AUX smdk-dltool-0.20-add-S3C64xx-support.patch 2057 RMD160 aa21b1b5f6a11605609c88672a780b553d42111d SHA1 fdae238df63cce443bb4e1b1d85b9411506b5924 SHA256 46515ec624570fc9d04d136fb7fc8a4a53cbbdadade7a3c9695e6458aeda2e83 AUX smdk-dltool-0.20-build.patch 430 RMD160 ea311960c9edd7d50d4e77077aabd176b7bf8cf6 SHA1 d0b56669e100ca0b793b28700ca72ddf6aab2813 SHA256 81e2059d8d6cf5a46b22c2691e122636756f3ef7bb2fb09e7ba23616643190b5 -AUX smdk-dltool-0.20-libusb-1.0.patch 8156 RMD160 5b27c878c0141160575e418e3e01ed716b014162 SHA1 afcfb8c562d4aa73099c3cd9b6b8859ac8b5ea4a SHA256 1e3bf0b44b8d78874e8d3c3cc22f022776cd3136c2f72e47e24c207819bc8114 +AUX smdk-dltool-0.20-libusb-1.0.patch 8207 RMD160 e9d523dd73172c8b1218de9a6cb0e380868dce41 SHA1 d141ddbd9875ea2149f92d9031187fff60e98756 SHA256 ad6f6c8719a6cc840ef8ca4c39782bca74cb777d4383e9c1bbdc88211b9a604c DIST smdk-tools-v0.20.tar.gz 5170 RMD160 ba61a3a7727a826cafceb8330310f36d64147f6b SHA1 c598c8eae03afcdfc508c09808f6548ad6934f56 SHA256 fdda1a8ddb8b71a7a74e8efc85bd08ba8cb953a61eb610b846cf291436426e48 -EBUILD smdk-dltool-0.20-r2.ebuild 920 RMD160 7ae3e3206cb93e79e6215e58fd392925b32cf101 SHA1 af4a994e61d68473946959d842e0c89b28267e03 SHA256 6e8e6cdb1cb24f8c695621ec5200409247810de24e412c1dc38afd5e5eb3733f -MISC ChangeLog 1191 RMD160 802c3f4645a5d253681892aec623a1963413394c SHA1 8cdec115c0ffcd08e19fd9d69a4587fb6a86d900 SHA256 4771f375531c7314e2467188c16e99d25b02b3bd6eebe1335108eec5b88b8407 +EBUILD smdk-dltool-0.20-r3.ebuild 920 RMD160 4e227c4111c23da5d853d67e4341eb90a3b562bb SHA1 1820bb3deebacff3ea7aea59eab813bd40e5765d SHA256 527443988af2dfe10c1a8a05f6c6120d75279d499e75ab57751545b83553eb77 +MISC ChangeLog 1448 RMD160 79e60ed6c0d74c35f335d3dc97a88cdb620eca50 SHA1 3fc2d458e5f3a0ce191a3f826e61b58def1a7c1d SHA256 a1bf655e40c309de5eda3181f9e245d7da48a9448115d22e31de270e2477f972 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBAgAGBQJPM/8mAAoJELEHsLL7fEFW9R8P/jIboUR++Zz5/5D9O/cKubZV -YFRDqpi0r7xuOsppR/UaxIC7hcUEzusizekPfIKvNnYC+C60QN/I30D7b+P+5mEa -7u6U9DkWa0ULjurZhp6ym9NWiuU9XQizg2CcYzuXaHEwyn4omsT2F6dij90Pxm8R -cGE+Uq36cn0Z6U+OHt7EkOWebL26tg6a39OmfzThQQCJypv7VzHnk4ml0wHtsbgd -zOi9Ddh90x5pzpK4qIqg8FAAg5BuOWRN+tyRHIKPDp1GSEcIfyZviGwPUSOH3mtZ -hhAS7Lau5RCWK8LqciAbTn9W4Uwqc2aTNO+XTX2wCLpP3D3G6QYTicMf2UtN1VL9 -Kw378i4Ng5g05PZkvVlkKGMdoo8goVqNMwI69qBqfH0llA93Fq3trtwCenGHPJCI -N4Z9vJAIeaoGvDuAL45sdDU4DOXT6U8UDXIcs9fHcCkkDgtaI4/4gPhrTiJZ23t9 -OJmmrP/7HAL17ZqpHDc6MQYnJzgCBwd2lGAhB4PP7f5GumqrSh4fjX34KOEko/4Z -WGILKgToF29Sp8dOCH8JzIsI/B8b5t0yWbrCXvryBuUSAwM6Zq1W7XXTO5QxJnOx -kGCIbA0/k/vzFCt/2DOQkz6vX4R2HUWpZc08TxQG816/xaTBgY1DOU+weTqzirfR -e1OmVdxSwS2LNSD1JgHY -=77hm +iQIcBAEBAgAGBQJPuvj8AAoJELEHsLL7fEFWdDgP/iPfGQSpfe+U23kWUw7fgWe1 +8VMjOeh3Zqyf+IEntHq4WoPIRS3mUjYXAnnSUHcNvWCG9RaT+FIpokpFqDGLpW+n +DDx7w6QQIa6JzZztYnOvTYk5nIgoSE5dJieMuphFJXTCbk8pKW5Ykny/Saj32wn+ +bQRTg/w3Wl6YJaNnxebMnFfYt/T4n08idvQ6O5dGEbX1C8oX7EMfDaNQx48jCcgN +x+Yo4FVl3HgtOORt2XVLLsoRQyN/onpwDew3PUcRBQWBPyemIlFEFLmd/I5Hs8cB +GX036PXRgrP60pNjdlpimEH7BDKjX6BMyqOHWxokQIRRy3T3qGMghKzyroNDXQWv +H6igJ/Jlek8S8wFoKstGXrazi8cU8BjFlVgc4ejPytG5OCTChWT+LK7XVkBESJy2 +4GThNPT7NXAPlkbIok/HtcyfmRM+pWzNAzW35rbg7gYEuH5Cemw6UwqwGbKQ8gcf +prIbcqXgDL+1WAeCe0MAYDhodYdz55rUCdfQKZSbRrHwFHci7KPkmBoGVFg9AkWD +kDaKKTC9HhTv6xSeAet63e/PkzOWnNzr+v5Y0jmNKE6n7tSgCFfEOCIHzxIt86kz +K+Ubfih3+bakWK2hg4S7LFc5HdfL6ZU+MZ1OJxDdQIkuI+IO99v8apQYNmadF+UM +FEbKhOBnhudNR+85SGhd +=j1lp -----END PGP SIGNATURE----- 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