qi-hardware/ben-blinkenlights
1
0
Fork 0
mirror of git://projects.qi-hardware.com/ben-blinkenlights.git synced 2025-04-21 12:27:27 +03:00
Code Activity

avrdude/: make patches relative to avrdude-<version> directory

Browse Source 
This way, the path names in the patch files stay the same across
avrdude versions.
This commit is contained in:
Werner Almesberger
2012-07-22 02:37:19 -03:00
parent 9942f62cb8
commit b0e83a9202
8 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
avrdude/patches/nanonote.patch
View File

@@ -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