<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# add_file "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
#  content [61afa951e7c1dbe064e1134cfd7c2c4e9f919fb7]
# 
# patch "packages/binutils/binutils_2.17.bb"
#  from [22565b10082a0e16f29e89a55311c299acbc31c1]
#    to [99e9c269f46aafaced069158eb736ec2b3c100b9]
# 
#   set "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 is binary
============================================================
<font color="#FF6600">--- packages/binutils/binutils_2.17.bb        22565b10082a0e16f29e89a55311c299acbc31c1</font>
<font color="#009900">+++ packages/binutils/binutils_2.17.bb        99e9c269f46aafaced069158eb736ec2b3c100b9</font>
<font color="#0000FF">@@ -1,6 +1,7 @@ require binutils.inc</font>
 require binutils.inc
<font color="#009900">+require binutils-avr32.inc</font>
 
<font color="#FF6600">-PR = "r4"</font>
<font color="#009900">+PR = "r5"</font>
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
<font color="#0000FF">@@ -18,9 +19,14 @@ SRC_URI += "\</font>
         file://300-012_check_ldrunpath_length.patch;patch=1 \
         file://300-001_ld_makefile_patch.patch;patch=1 \
         file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
<font color="#FF6600">-        file://500-avr32-atmel.1.3.0.patch;patch=1 \</font>
<font color="#FF6600">-        file://501-avr32-fix-pool-alignment.patch;patch=1 \</font>
 "
<font color="#009900">+# removed in favor of the atmel 1.2.6 patch which is supposedly newer (yes)</font>
<font color="#009900">+#        file://500-avr32-atmel.1.3.0.patch;patch=1 \</font>
<font color="#009900">+#        file://501-avr32-fix-pool-alignment.patch;patch=1 \</font>
 
<font color="#009900">+SRC_URI_append_avr32 = "\</font>
<font color="#009900">+        file://binutils-2.17.atmel.1.2.6.patch.bz2;patch=1 \</font>
<font color="#009900">+"</font>
<font color="#009900">+</font>
 # Zecke's OSX fixes
 SRC_URI += " file://warning-free.patch;patch=1 "
</tt></pre>