mirror of
git://projects.qi-hardware.com/ben-blinkenlights.git
synced 2024-12-25 21:04:34 +02:00
avrdude/: make patches relative to avrdude-<version> directory
This way, the path names in the patch files stay the same across avrdude versions.
This commit is contained in:
parent
9942f62cb8
commit
b0e83a9202
@ -4,6 +4,7 @@ wget http://download.savannah.gnu.org/releases/avrdude/avrdude-5.10.tar.gz
|
||||
tar xfz avrdude-5.10.tar.gz
|
||||
cd avrdude-5.10
|
||||
|
||||
ln -s ../patches
|
||||
quilt push -a
|
||||
|
||||
aclocal
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: avrdude/avrdude-5.10/avrdude.conf.in
|
||||
Index: avrdude/avrdude.conf.in
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/avrdude.conf.in 2011-02-11 00:33:27.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/avrdude.conf.in 2011-02-11 08:43:53.000000000 -0300
|
||||
--- avrdude.orig/avrdude.conf.in 2011-02-11 00:33:27.000000000 -0300
|
||||
+++ avrdude/avrdude.conf.in 2011-02-11 08:43:53.000000000 -0300
|
||||
@@ -13033,6 +13033,191 @@
|
||||
;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: avrdude/avrdude-5.10/avrpart.h
|
||||
Index: avrdude/avrpart.h
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/avrpart.h 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/avrpart.h 2011-03-08 23:40:13.000000000 -0300
|
||||
--- avrdude.orig/avrpart.h 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/avrpart.h 2011-03-08 23:40:13.000000000 -0300
|
||||
@@ -185,6 +185,8 @@
|
||||
|
||||
unsigned char * buf; /* pointer to memory buffer */
|
||||
@ -11,10 +11,10 @@ Index: avrdude/avrdude-5.10/avrpart.h
|
||||
} AVRMEM;
|
||||
|
||||
#ifdef __cplusplus
|
||||
Index: avrdude/avrdude-5.10/config_gram.y
|
||||
Index: avrdude/config_gram.y
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/config_gram.y 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/config_gram.y 2011-03-08 23:40:13.000000000 -0300
|
||||
--- avrdude.orig/config_gram.y 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/config_gram.y 2011-03-08 23:40:13.000000000 -0300
|
||||
@@ -1209,6 +1209,7 @@
|
||||
}
|
||||
mem_specs
|
||||
@ -23,10 +23,10 @@ Index: avrdude/avrdude-5.10/config_gram.y
|
||||
ladd(current_part->mem, current_mem);
|
||||
current_mem = NULL;
|
||||
} |
|
||||
Index: avrdude/avrdude-5.10/fileio.c
|
||||
Index: avrdude/fileio.c
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/fileio.c 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/fileio.c 2011-03-08 23:40:13.000000000 -0300
|
||||
--- avrdude.orig/fileio.c 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/fileio.c 2011-03-08 23:40:13.000000000 -0300
|
||||
@@ -52,7 +52,7 @@
|
||||
char * outfile, FILE * outf);
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: avrdude/avrdude-5.10/avrdude.conf.in
|
||||
Index: avrdude/avrdude.conf.in
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/avrdude.conf.in 2011-02-04 14:21:42.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/avrdude.conf.in 2011-02-04 14:21:48.000000000 -0300
|
||||
--- avrdude.orig/avrdude.conf.in 2011-02-04 14:21:42.000000000 -0300
|
||||
+++ avrdude/avrdude.conf.in 2011-02-04 14:21:48.000000000 -0300
|
||||
@@ -615,6 +615,17 @@
|
||||
miso = 1;
|
||||
;
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: avrdude/avrdude-5.10/avrdude.conf.in
|
||||
Index: avrdude/avrdude.conf.in
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/avrdude.conf.in 2011-03-09 17:21:53.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/avrdude.conf.in 2011-03-09 17:23:04.000000000 -0300
|
||||
--- avrdude.orig/avrdude.conf.in 2011-03-09 17:21:53.000000000 -0300
|
||||
+++ avrdude/avrdude.conf.in 2011-03-09 17:23:04.000000000 -0300
|
||||
@@ -626,6 +626,16 @@
|
||||
pgmled = 2;
|
||||
;
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: avrdude/avrdude-5.10/avrdude.conf.in
|
||||
Index: avrdude/avrdude.conf.in
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/avrdude.conf.in 2011-03-09 17:13:57.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/avrdude.conf.in 2011-03-09 17:19:28.000000000 -0300
|
||||
--- avrdude.orig/avrdude.conf.in 2011-03-09 17:13:57.000000000 -0300
|
||||
+++ avrdude/avrdude.conf.in 2011-03-09 17:19:28.000000000 -0300
|
||||
@@ -592,6 +592,29 @@
|
||||
type = avr910;
|
||||
;
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: avrdude/avrdude-5.10/Makefile.am
|
||||
Index: avrdude/Makefile.am
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/Makefile.am 2011-03-07 16:50:03.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/Makefile.am 2011-03-07 16:50:06.000000000 -0300
|
||||
--- avrdude.orig/Makefile.am 2011-03-07 16:50:03.000000000 -0300
|
||||
+++ avrdude/Makefile.am 2011-03-07 16:50:06.000000000 -0300
|
||||
@@ -111,6 +111,8 @@
|
||||
lists.c \
|
||||
lists.h \
|
||||
@ -11,10 +11,10 @@ Index: avrdude/avrdude-5.10/Makefile.am
|
||||
par.c \
|
||||
par.h \
|
||||
pgm.c \
|
||||
Index: avrdude/avrdude-5.10/config_gram.y
|
||||
Index: avrdude/config_gram.y
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/config_gram.y 2011-03-07 16:50:03.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/config_gram.y 2011-03-07 16:50:06.000000000 -0300
|
||||
--- avrdude.orig/config_gram.y 2011-03-07 16:50:03.000000000 -0300
|
||||
+++ avrdude/config_gram.y 2011-03-07 16:50:06.000000000 -0300
|
||||
@@ -48,6 +48,7 @@
|
||||
#include "avr.h"
|
||||
#include "jtagmkI.h"
|
||||
@ -44,10 +44,10 @@ Index: avrdude/avrdude-5.10/config_gram.y
|
||||
K_DESC TKN_EQUAL TKN_STRING {
|
||||
strncpy(current_prog->desc, $3->value.string, PGM_DESCLEN);
|
||||
current_prog->desc[PGM_DESCLEN-1] = 0;
|
||||
Index: avrdude/avrdude-5.10/lexer.l
|
||||
Index: avrdude/lexer.l
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/lexer.l 2011-03-07 16:50:03.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/lexer.l 2011-03-07 16:50:06.000000000 -0300
|
||||
--- avrdude.orig/lexer.l 2011-03-07 16:50:03.000000000 -0300
|
||||
+++ avrdude/lexer.l 2011-03-07 16:50:06.000000000 -0300
|
||||
@@ -164,6 +164,7 @@
|
||||
min_write_delay { yylval=NULL; return K_MIN_WRITE_DELAY; }
|
||||
miso { yylval=NULL; return K_MISO; }
|
||||
@ -56,10 +56,10 @@ Index: avrdude/avrdude-5.10/lexer.l
|
||||
num_banks { yylval=NULL; return K_NUM_PAGES; }
|
||||
num_pages { yylval=NULL; return K_NUM_PAGES; }
|
||||
nvm_base { yylval=NULL; return K_NVM_BASE; }
|
||||
Index: avrdude/avrdude-5.10/nanonote.c
|
||||
Index: avrdude/nanonote.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ avrdude/avrdude-5.10/nanonote.c 2011-03-07 17:07:16.000000000 -0300
|
||||
+++ avrdude/nanonote.c 2011-03-07 17:07:16.000000000 -0300
|
||||
@@ -0,0 +1,374 @@
|
||||
+/*
|
||||
+ * avrdude - A Downloader/Uploader for AVR device programmers
|
||||
@ -435,10 +435,10 @@ Index: avrdude/avrdude-5.10/nanonote.c
|
||||
+ }
|
||||
+ PDATA(pgm)->clk = 0;
|
||||
+}
|
||||
Index: avrdude/avrdude-5.10/nanonote.h
|
||||
Index: avrdude/nanonote.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ avrdude/avrdude-5.10/nanonote.h 2011-03-07 16:50:06.000000000 -0300
|
||||
+++ avrdude/nanonote.h 2011-03-07 16:50:06.000000000 -0300
|
||||
@@ -0,0 +1,6 @@
|
||||
+#ifndef nanonote_h
|
||||
+#define nanonote_h
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: avrdude/avrdude-5.10/avr.c
|
||||
Index: avrdude/avr.c
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/avr.c 2011-03-08 23:46:53.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/avr.c 2011-03-08 23:50:06.000000000 -0300
|
||||
--- avrdude.orig/avr.c 2011-03-08 23:46:53.000000000 -0300
|
||||
+++ avrdude/avr.c 2011-03-08 23:50:06.000000000 -0300
|
||||
@@ -192,7 +192,8 @@
|
||||
}
|
||||
}
|
||||
@ -22,10 +22,10 @@ Index: avrdude/avrdude-5.10/avr.c
|
||||
data = m->buf[i];
|
||||
report_progress(i, wsize, NULL);
|
||||
|
||||
Index: avrdude/avrdude-5.10/update.c
|
||||
Index: avrdude/update.c
|
||||
===================================================================
|
||||
--- avrdude.orig/avrdude-5.10/update.c 2011-03-08 23:46:53.000000000 -0300
|
||||
+++ avrdude/avrdude-5.10/update.c 2011-03-08 23:47:45.000000000 -0300
|
||||
--- avrdude.orig/update.c 2011-03-08 23:46:53.000000000 -0300
|
||||
+++ avrdude/update.c 2011-03-08 23:47:45.000000000 -0300
|
||||
@@ -224,6 +224,7 @@
|
||||
progname, mem->desc);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user