[oe-commits] org.oe.dev binutils-2.17: Add AVR32 patch 1.2.6 from Atmel.

[gwossum commit]

binutils-2.17: Add AVR32 patch 1.2.6 from Atmel.

Author: gwossum
Branch: org.openembedded.dev
Revision: a6bf143c80d2e93e56dcde0cba69144cabf68116
ViewMTN: http://monotone.openembedded.org/revision/info/a6bf143c80d2e93e56dcde0cba69144cabf68116
Files:
1
packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2
packages/binutils/binutils_2.17.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r29a3481a2a476ba9e44b1e5984e32fdcf2182935 -ra6bf143c80d2e93e56dcde0cba69144cabf68116
#
#
#
# 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
============================================================
--- packages/binutils/binutils_2.17.bb	22565b10082a0e16f29e89a55311c299acbc31c1
+++ packages/binutils/binutils_2.17.bb	99e9c269f46aafaced069158eb736ec2b3c100b9
@@ -1,6 +1,7 @@ require binutils.inc
 require binutils.inc
+require binutils-avr32.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
@@ -18,9 +19,14 @@ SRC_URI += "\
 	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 \
-        file://500-avr32-atmel.1.3.0.patch;patch=1 \
-        file://501-avr32-fix-pool-alignment.patch;patch=1 \
 "
+# removed in favor of the atmel 1.2.6 patch which is supposedly newer (yes)
+#        file://500-avr32-atmel.1.3.0.patch;patch=1 \
+#        file://501-avr32-fix-pool-alignment.patch;patch=1 \
 
+SRC_URI_append_avr32 = "\
+        file://binutils-2.17.atmel.1.2.6.patch.bz2;patch=1 \
+"
+
 # Zecke's OSX fixes
 SRC_URI += " file://warning-free.patch;patch=1 "