diff options
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/smdk-dltool/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch | 15 | ||||
| -rw-r--r-- | dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild (renamed from dev-embedded/smdk-dltool/smdk-dltool-0.20-r1.ebuild) | 2 | ||||
| -rw-r--r-- | dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild | 33 |
4 files changed, 21 insertions, 38 deletions
diff --git a/dev-embedded/smdk-dltool/ChangeLog b/dev-embedded/smdk-dltool/ChangeLog index db27c9a4d690..047b699e5bd2 100644 --- a/dev-embedded/smdk-dltool/ChangeLog +++ b/dev-embedded/smdk-dltool/ChangeLog @@ -1,6 +1,13 @@ # 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.4 2012/01/31 16:13:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/ChangeLog,v 1.5 2012/02/09 17:15:11 vapier Exp $ + +*smdk-dltool-0.20-r2 (09 Feb 2012) + + 09 Feb 2012; Mike Frysinger <vapier@gentoo.org> -smdk-dltool-0.20.ebuild, + -smdk-dltool-0.20-r1.ebuild, +smdk-dltool-0.20-r2.ebuild, + files/smdk-dltool-0.20-libusb-1.0.patch: + Tweak libusb-1 patch to fix runtime misbehavior. 31 Jan 2012; Mike Frysinger <vapier@gentoo.org> smdk-dltool-0.20-r1.ebuild: Drop debug code that shouldn't have been committed. 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 408c7e47df9c..ee72106c8b85 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 @@ -107,7 +107,7 @@ migrate to libusb-1 by me (Mike Frysinger) .name = NULL } }; -@@ -181,12 +198,14 @@ int flg_show = 0; +@@ -181,12 +204,14 @@ int flg_show = 0; int main(int argc, char **argv) { @@ -127,7 +127,7 @@ migrate to libusb-1 by me (Mike Frysinger) printf("SMDK42XX,S3C64XX USB Download Tool\n"); printf("Version 0.20 (c) 2004,2005,2006" -@@ -197,7 +216,7 @@ int main(int argc, char **argv) +@@ -197,7 +222,7 @@ int main(int argc, char **argv) int index = 0; int c; @@ -136,7 +136,7 @@ migrate to libusb-1 by me (Mike Frysinger) DBG(("option index %d\n",c )); -@@ -218,117 +237,116 @@ int main(int argc, char **argv) +@@ -218,117 +243,125 @@ int main(int argc, char **argv) break; case 'b': @@ -277,12 +277,21 @@ migrate to libusb-1 by me (Mike Frysinger) - } + ret = libusb_open(found, &devh); + if (ret == 0) { ++ /* ++ * Seems to break some recovery modes :( ++ * http://crosbug.com/26083 ++ * These fail: ++ * smdk-dltool -a 0x02021400 -f bl1.bin ++ * smdk-dltool -a 0x02023400 -f bl2.bin ++ */ ++#if 0 + uint8_t configuration; + struct libusb_config_descriptor *config; + libusb_get_active_config_descriptor(found, &config); + configuration = config->bConfigurationValue; + libusb_free_config_descriptor(config); + libusb_set_configuration(devh, configuration); ++#endif + } else + errp("libusb_open"); diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r1.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild index ba155332ffb5..8fe8138dbd04 100644 --- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r1.ebuild +++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.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-r1.ebuild,v 1.2 2012/01/31 16:13:21 vapier Exp $ +# $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" diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild deleted file mode 100644 index 96027a06463e..000000000000 --- a/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild +++ /dev/null @@ -1,33 +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.ebuild,v 1.2 2012/01/27 18:43:13 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:0" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool - -src_prepare() { - epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch - epatch "${FILESDIR}"/${P}-build.patch - tc-export CC -} - -src_install() { - newbin dltool smdk-usbdl - dodoc readme.txt -} |