diff options
| author |   Robert Schuster <rschus@tarub.tarent.buero> | 2011-03-12 09:23:07 +0100 |
|---|---|---|
| committer | Robert Schuster <rschus@tarub.tarent.buero> | 2011-03-12 09:23:07 +0100 |
| commit | 28d9710a010850638c3c867cd43b3732bbc6269f (patch) | |
| tree | 30c80ad0279e3776fdf178e973ff730ef6ed9bd1 /recipes/avrdude/avrdude-5.10 | |
| parent | 3e2ca37a1e5346cf7457efbf142e443ea7ee8f37 (diff) | |
| download | openembedded-28d9710a010850638c3c867cd43b3732bbc6269f.tar.gz | |
avrdude 5.10: Added patches from Debian.
Diffstat (limited to 'recipes/avrdude/avrdude-5.10')
| -rw-r--r-- | recipes/avrdude/avrdude-5.10/02-manpage_fix.patch | 35 | ||||
| -rw-r--r-- | recipes/avrdude/avrdude-5.10/03-fix_auto_reset.patch | 29 |
2 files changed, 64 insertions, 0 deletions
diff --git a/recipes/avrdude/avrdude-5.10/02-manpage_fix.patch b/recipes/avrdude/avrdude-5.10/02-manpage_fix.patch new file mode 100644 index 0000000000..f8c9262079 --- /dev/null +++ b/recipes/avrdude/avrdude-5.10/02-manpage_fix.patch @@ -0,0 +1,35 @@ +Description: Fix paths in the man page + Update the man page to point to the correct location of the documentation + and config file when installed on a Debian system. +Author: Michael Biebl <biebl@debian.org> +Index: avrdude/avrdude.1 +=================================================================== +--- avrdude.orig/avrdude.1 2010-01-17 02:31:26.738486618 +0100 ++++ avrdude/avrdude.1 2010-01-17 02:33:50.154482626 +0100 +@@ -343,7 +343,7 @@ + does not know about, you can add it to the config file (be sure and + submit a patch back to the author so that it can be incorporated for + the next version). See the config file, located at +-.Pa ${PREFIX}/etc/avrdude.conf , ++.Pa /etc/avrdude.conf , + which contains a description of the format. + .It Fl D + Disable auto erase for flash. When the +@@ -964,7 +964,7 @@ + .It Pa /dev/ppi0 + default device to be used for communication with the programming + hardware +-.It Pa ${PREFIX}/etc/avrdude.conf ++.It Pa /etc/avrdude.conf + programmer and parts configuration file + .It Pa ${HOME}/.avrduderc + programmer and parts configuration file (per-user overrides) +@@ -972,7 +972,7 @@ + Initialization file for the + .Xr readline 3 + library +-.It Pa ${PREFIX}/share/doc/avrdude/avrdude.pdf ++.It Pa /usr/share/doc/avrdude-doc/avrdude.pdf + Schematic of programming hardware + .El + .\" .Sh EXAMPLES diff --git a/recipes/avrdude/avrdude-5.10/03-fix_auto_reset.patch b/recipes/avrdude/avrdude-5.10/03-fix_auto_reset.patch new file mode 100644 index 0000000000..71b29451d5 --- /dev/null +++ b/recipes/avrdude/avrdude-5.10/03-fix_auto_reset.patch @@ -0,0 +1,29 @@ +Author: Michal Ludvig <mludvig@logix.net.nz> +Description: Fixed DTR on/off to make Arduino auto-reset work. +Origin: http://svn.savannah.gnu.org/viewvc?view=rev&root=avrdude&revision=940 +Bug: http://savannah.nongnu.org/bugs/?29108 +Bug-Ubuntu: https://bugs.launchpad.net/arduino/+bug/529444 + +=== modified file 'ser_posix.c' +Index: avrdude/ser_posix.c +=================================================================== +--- avrdude.orig/ser_posix.c 2010-03-22 17:28:07.000000000 -0400 ++++ avrdude/ser_posix.c 2010-03-22 17:28:42.000000000 -0400 +@@ -230,13 +230,13 @@ + } + + if (is_on) { +- /* Clear DTR and RTS */ +- ctl &= ~(TIOCM_DTR | TIOCM_RTS); +- } +- else { + /* Set DTR and RTS */ + ctl |= (TIOCM_DTR | TIOCM_RTS); + } ++ else { ++ /* Clear DTR and RTS */ ++ ctl &= ~(TIOCM_DTR | TIOCM_RTS); ++ } + + r = ioctl(fdp->ifd, TIOCMSET, &ctl); + if (r < 0) { |