diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-06-16 02:11:28 -0700 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-06-17 23:13:05 +0100 |
commit | cea3fe7d6e38b345a8864638afecc7a17d9f47fb (patch) | |
tree | eb76858f423a419601fe9fd96448e91c8cd2ed96 | |
parent | 30e98b4a0d85163acd5d33d252f8637bfd40b2ef (diff) | |
download | poky-cea3fe7d6e38b345a8864638afecc7a17d9f47fb.tar.gz |
binutils: remove older versions
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
23 files changed, 0 insertions, 677 deletions
diff --git a/meta/packages/binutils/binutils-2.18/110-arm-eabi-conf.patch b/meta/packages/binutils/binutils-2.18/110-arm-eabi-conf.patch deleted file mode 100644 index 050969bf64..0000000000 --- a/meta/packages/binutils/binutils-2.18/110-arm-eabi-conf.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure | ||
2 | --- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300 | ||
3 | +++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300 | ||
4 | @@ -1299,7 +1299,7 @@ | ||
5 | arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) | ||
6 | noconfigdirs="$noconfigdirs target-libffi target-qthreads" | ||
7 | ;; | ||
8 | - arm*-*-linux-gnueabi) | ||
9 | + arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) | ||
10 | noconfigdirs="$noconfigdirs target-libffi target-qthreads" | ||
11 | noconfigdirs="$noconfigdirs target-libjava target-libobjc" | ||
12 | ;; | ||
13 | diff -urN binutils-2.16.91.0.7.orig/configure.in binutils-2.16.91.0.7/configure.in | ||
14 | --- binutils-2.16.91.0.7.orig/configure.ac 2006-05-31 14:54:24.000000000 +0300 | ||
15 | +++ binutils-2.16.91.0.7/configure.ac 2006-05-31 14:55:53.000000000 +0300 | ||
16 | @@ -497,7 +497,7 @@ | ||
17 | arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) | ||
18 | noconfigdirs="$noconfigdirs target-libffi target-qthreads" | ||
19 | ;; | ||
20 | - arm*-*-linux-gnueabi) | ||
21 | + arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) | ||
22 | noconfigdirs="$noconfigdirs target-libffi target-qthreads" | ||
23 | noconfigdirs="$noconfigdirs target-libjava target-libobjc" | ||
24 | ;; | ||
diff --git a/meta/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/meta/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch deleted file mode 100644 index 8df5b1fea0..0000000000 --- a/meta/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | # strip (and objcopy) fail to set the error code if there is no | ||
2 | # output file name and the rename of the stripped (or copied) file | ||
3 | # fails, yet the command fails to do anything. This fixes both | ||
4 | # objcopy and strip. | ||
5 | # | ||
6 | # modification by bero: Ported to 2.16.91.0.6 | ||
7 | # | ||
8 | #Signed-off-by: John Bowler <jbowler@acm.org> | ||
9 | #Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org> | ||
10 | --- | ||
11 | # binutils/objcopy.c | 8 +++++--- | ||
12 | # 1 file changed, 5 insertions(+), 3 deletions(-) | ||
13 | # | ||
14 | Index: src/binutils/objcopy.c | ||
15 | =================================================================== | ||
16 | --- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100 | ||
17 | +++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100 | ||
18 | @@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[]) | ||
19 | if (preserve_dates) | ||
20 | set_times (tmpname, &statbuf); | ||
21 | if (output_file != tmpname) | ||
22 | - smart_rename (tmpname, output_file ? output_file : argv[i], | ||
23 | - preserve_dates); | ||
24 | + if (smart_rename (tmpname, output_file ? output_file : argv[i], | ||
25 | + preserve_dates)) | ||
26 | + hold_status = 1; | ||
27 | status = hold_status; | ||
28 | } | ||
29 | else | ||
30 | @@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[]) | ||
31 | if (preserve_dates) | ||
32 | set_times (tmpname, &statbuf); | ||
33 | if (tmpname != output_filename) | ||
34 | - smart_rename (tmpname, input_filename, preserve_dates); | ||
35 | + if (smart_rename (tmpname, input_filename, preserve_dates)) | ||
36 | + status = 1; | ||
37 | } | ||
38 | else | ||
39 | unlink_if_ordinary (tmpname); | ||
diff --git a/meta/packages/binutils/binutils-2.18/binutils-configure-texinfo-version.patch b/meta/packages/binutils/binutils-2.18/binutils-configure-texinfo-version.patch deleted file mode 100644 index dd21aed862..0000000000 --- a/meta/packages/binutils/binutils-2.18/binutils-configure-texinfo-version.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | --- binutils-2.18/configure.orig 2007-10-11 21:09:27.000000000 -0700 | ||
2 | +++ binutils-2.18/configure 2007-10-11 21:10:20.000000000 -0700 | ||
3 | @@ -6128,7 +6128,7 @@ case " $build_configdirs " in | ||
4 | # For an installed makeinfo, we require it to be from texinfo 4.4 or | ||
5 | # higher, else we use the "missing" dummy. | ||
6 | if ${MAKEINFO} --version \ | ||
7 | - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then | ||
8 | + | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then | ||
9 | : | ||
10 | else | ||
11 | MAKEINFO="$MISSING makeinfo" | ||
12 | --- binutils-2.18/configure.ac.orig 2007-10-11 21:10:54.000000000 -0700 | ||
13 | +++ binutils-2.18/configure.ac 2007-10-11 21:11:13.000000000 -0700 | ||
14 | @@ -2403,7 +2403,7 @@ changequote(,) | ||
15 | # For an installed makeinfo, we require it to be from texinfo 4.4 or | ||
16 | # higher, else we use the "missing" dummy. | ||
17 | if ${MAKEINFO} --version \ | ||
18 | - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then | ||
19 | + | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then | ||
20 | : | ||
21 | else | ||
22 | MAKEINFO="$MISSING makeinfo" | ||
diff --git a/meta/packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch b/meta/packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch deleted file mode 100644 index 8de04e0fe0..0000000000 --- a/meta/packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | --- binutils-2.18.orig/configure | ||
2 | +++ binutils-2.18/configure | ||
3 | @@ -2206,7 +2206,7 @@ | ||
4 | am33_2.0-*-linux*) | ||
5 | noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" | ||
6 | ;; | ||
7 | - sh-*-linux*) | ||
8 | + sh*-*-linux*) | ||
9 | noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" | ||
10 | ;; | ||
11 | sh*-*-pe|mips*-*-pe|*arm-wince-pe) | ||
12 | @@ -2504,7 +2504,7 @@ | ||
13 | romp-*-*) | ||
14 | noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" | ||
15 | ;; | ||
16 | - sh-*-* | sh64-*-*) | ||
17 | + sh*-*-* | sh64-*-*) | ||
18 | case "${host}" in | ||
19 | i[3456789]86-*-vsta) ;; # don't add gprof back in | ||
20 | i[3456789]86-*-go32*) ;; # don't add gprof back in | ||
21 | --- binutils-2.18.orig/gprof/configure | ||
22 | +++ binutils-2.18/gprof/configure | ||
23 | @@ -4124,6 +4124,11 @@ | ||
24 | lt_cv_deplibs_check_method=pass_all | ||
25 | ;; | ||
26 | |||
27 | +linux-uclibc*) | ||
28 | + lt_cv_deplibs_check_method=pass_all | ||
29 | + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` | ||
30 | + ;; | ||
31 | + | ||
32 | netbsd*) | ||
33 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | ||
34 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | ||
diff --git a/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch deleted file mode 100644 index 04a7e61e25..0000000000 --- a/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | ## 001_ld_makefile_patch.dpatch | ||
3 | ## | ||
4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
5 | ## DP: Description: correct where ld scripts are installed | ||
6 | ## DP: Author: Chris Chimelis <chris@debian.org> | ||
7 | ## DP: Upstream status: N/A | ||
8 | ## DP: Date: ?? | ||
9 | |||
10 | if [ $# -ne 1 ]; then | ||
11 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
12 | exit 1 | ||
13 | fi | ||
14 | |||
15 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | ||
16 | patch_opts="${patch_opts:--f --no-backup-if-mismatch}" | ||
17 | |||
18 | case "$1" in | ||
19 | -patch) patch $patch_opts -p1 < $0;; | ||
20 | -unpatch) patch $patch_opts -p1 -R < $0;; | ||
21 | *) | ||
22 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
23 | exit 1;; | ||
24 | esac | ||
25 | |||
26 | exit 0 | ||
27 | |||
28 | @DPATCH@ | ||
29 | --- binutils-2.16.91.0.1/ld/Makefile.am | ||
30 | +++ binutils-2.16.91.0.1/ld/Makefile.am | ||
31 | @@ -20,7 +20,7 @@ | ||
32 | # We put the scripts in the directory $(scriptdir)/ldscripts. | ||
33 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | ||
34 | # directives need to be different for native and cross linkers. | ||
35 | -scriptdir = $(tooldir)/lib | ||
36 | +scriptdir = $(libdir) | ||
37 | |||
38 | EMUL = @EMUL@ | ||
39 | EMULATION_OFILES = @EMULATION_OFILES@ | ||
40 | --- binutils-2.16.91.0.1/ld/Makefile.in | ||
41 | +++ binutils-2.16.91.0.1/ld/Makefile.in | ||
42 | @@ -268,7 +268,7 @@ | ||
43 | # We put the scripts in the directory $(scriptdir)/ldscripts. | ||
44 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | ||
45 | # directives need to be different for native and cross linkers. | ||
46 | -scriptdir = $(tooldir)/lib | ||
47 | +scriptdir = $(libdir) | ||
48 | BASEDIR = $(srcdir)/.. | ||
49 | BFDDIR = $(BASEDIR)/bfd | ||
50 | INCDIR = $(BASEDIR)/include | ||
diff --git a/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch b/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch deleted file mode 100644 index f337611edf..0000000000 --- a/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | ## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com> | ||
3 | ## | ||
4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
5 | ## DP: Specify which filename is causing an error if the filename is a | ||
6 | ## DP: directory. (#45832) | ||
7 | |||
8 | if [ $# -ne 1 ]; then | ||
9 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
10 | exit 1 | ||
11 | fi | ||
12 | |||
13 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | ||
14 | patch_opts="${patch_opts:--f --no-backup-if-mismatch}" | ||
15 | |||
16 | case "$1" in | ||
17 | -patch) patch $patch_opts -p1 < $0;; | ||
18 | -unpatch) patch $patch_opts -p1 -R < $0;; | ||
19 | *) | ||
20 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
21 | exit 1;; | ||
22 | esac | ||
23 | |||
24 | exit 0 | ||
25 | |||
26 | @DPATCH@ | ||
27 | diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c | ||
28 | --- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 | ||
29 | +++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 | ||
30 | @@ -150,6 +150,13 @@ | ||
31 | { | ||
32 | bfd *nbfd; | ||
33 | const bfd_target *target_vec; | ||
34 | + struct stat s; | ||
35 | + | ||
36 | + if (stat (filename, &s) == 0) | ||
37 | + if (S_ISDIR(s.st_mode)) { | ||
38 | + bfd_set_error (bfd_error_file_not_recognized); | ||
39 | + return NULL; | ||
40 | + } | ||
41 | |||
42 | nbfd = _bfd_new_bfd (); | ||
43 | if (nbfd == NULL) | ||
diff --git a/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch deleted file mode 100644 index 498651a90c..0000000000 --- a/meta/packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | ## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org> | ||
3 | ## | ||
4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
5 | ## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for | ||
6 | ## DP: cases where -rpath isn't specified. (#151024) | ||
7 | |||
8 | if [ $# -ne 1 ]; then | ||
9 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
10 | exit 1 | ||
11 | fi | ||
12 | |||
13 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | ||
14 | patch_opts="${patch_opts:--f --no-backup-if-mismatch}" | ||
15 | |||
16 | case "$1" in | ||
17 | -patch) patch $patch_opts -p1 < $0;; | ||
18 | -unpatch) patch $patch_opts -p1 -R < $0;; | ||
19 | *) | ||
20 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
21 | exit 1;; | ||
22 | esac | ||
23 | |||
24 | exit 0 | ||
25 | |||
26 | @DPATCH@ | ||
27 | diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em | ||
28 | --- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100 | ||
29 | +++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100 | ||
30 | @@ -692,6 +692,8 @@ | ||
31 | && command_line.rpath == NULL) | ||
32 | { | ||
33 | lib_path = (const char *) getenv ("LD_RUN_PATH"); | ||
34 | + if ((lib_path) && (strlen (lib_path) == 0)) | ||
35 | + lib_path = NULL; | ||
36 | if (gld${EMULATION_NAME}_search_needed (lib_path, &n, | ||
37 | force)) | ||
38 | break; | ||
39 | @@ -871,6 +873,8 @@ | ||
40 | rpath = command_line.rpath; | ||
41 | if (rpath == NULL) | ||
42 | rpath = (const char *) getenv ("LD_RUN_PATH"); | ||
43 | + if ((rpath) && (strlen (rpath) == 0)) | ||
44 | + rpath = NULL; | ||
45 | if (! (bfd_elf_size_dynamic_sections | ||
46 | (output_bfd, command_line.soname, rpath, | ||
47 | command_line.filter_shlib, | ||
diff --git a/meta/packages/binutils/binutils-2.19/110-arm-eabi-conf.patch b/meta/packages/binutils/binutils-2.19/110-arm-eabi-conf.patch deleted file mode 100644 index 2623301da0..0000000000 --- a/meta/packages/binutils/binutils-2.19/110-arm-eabi-conf.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | --- /tmp/configure.ac 2008-06-22 14:14:59.000000000 +0200 | ||
2 | +++ binutils-2.18.50.0.7/configure.ac 2008-06-22 14:15:30.000000000 +0200 | ||
3 | @@ -561,7 +561,7 @@ | ||
4 | noconfigdirs="$noconfigdirs target-libffi target-qthreads" | ||
5 | libgloss_dir=arm | ||
6 | ;; | ||
7 | - arm*-*-linux-gnueabi) | ||
8 | + arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) | ||
9 | noconfigdirs="$noconfigdirs target-qthreads" | ||
10 | noconfigdirs="$noconfigdirs target-libobjc" | ||
11 | case ${with_newlib} in | ||
12 | --- /tmp/configure 2008-06-22 14:17:11.000000000 +0200 | ||
13 | +++ binutils-2.18.50.0.7/configure 2008-06-22 14:17:56.000000000 +0200 | ||
14 | @@ -2307,7 +2307,7 @@ | ||
15 | noconfigdirs="$noconfigdirs target-libffi target-qthreads" | ||
16 | libgloss_dir=arm | ||
17 | ;; | ||
18 | - arm*-*-linux-gnueabi) | ||
19 | + arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) | ||
20 | noconfigdirs="$noconfigdirs target-qthreads" | ||
21 | noconfigdirs="$noconfigdirs target-libobjc" | ||
22 | case ${with_newlib} in | ||
diff --git a/meta/packages/binutils/binutils-2.19/binutils-2.16.1-e300c2c3.patch b/meta/packages/binutils/binutils-2.19/binutils-2.16.1-e300c2c3.patch deleted file mode 100644 index c5e4234f22..0000000000 --- a/meta/packages/binutils/binutils-2.19/binutils-2.16.1-e300c2c3.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Adds support for Freescale Power architecture e300c2 and e300c3 cores. | ||
2 | http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm | ||
3 | |||
4 | Leon Woestenberg <leonw@mailcan.com> | ||
5 | |||
6 | diff -uNr binutils-2.16.1.orig/gas/config/tc-ppc.c binutils-2.16.1/gas/config/tc-ppc.c | ||
7 | --- binutils-2.16.1.orig/gas/config/tc-ppc.c 2005-03-02 13:24:01.000000000 +0000 | ||
8 | +++ binutils-2.16.1/gas/config/tc-ppc.c 2006-07-04 11:45:24.000000000 +0100 | ||
9 | @@ -879,6 +879,10 @@ | ||
10 | else | ||
11 | ppc_cpu |= PPC_OPCODE_SPE; | ||
12 | } | ||
13 | + else if (strcmp (arg, "pmr") == 0) | ||
14 | + { | ||
15 | + ppc_cpu |= PPC_OPCODE_PMR; | ||
16 | + } | ||
17 | /* -mppc64 and -m620 mean to assemble for the 64-bit PowerPC | ||
18 | 620. */ | ||
19 | else if (strcmp (arg, "ppc64") == 0 || strcmp (arg, "620") == 0) | ||
diff --git a/meta/packages/binutils/binutils-2.19/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/meta/packages/binutils/binutils-2.19/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch deleted file mode 100644 index 8df5b1fea0..0000000000 --- a/meta/packages/binutils/binutils-2.19/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | # strip (and objcopy) fail to set the error code if there is no | ||
2 | # output file name and the rename of the stripped (or copied) file | ||
3 | # fails, yet the command fails to do anything. This fixes both | ||
4 | # objcopy and strip. | ||
5 | # | ||
6 | # modification by bero: Ported to 2.16.91.0.6 | ||
7 | # | ||
8 | #Signed-off-by: John Bowler <jbowler@acm.org> | ||
9 | #Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org> | ||
10 | --- | ||
11 | # binutils/objcopy.c | 8 +++++--- | ||
12 | # 1 file changed, 5 insertions(+), 3 deletions(-) | ||
13 | # | ||
14 | Index: src/binutils/objcopy.c | ||
15 | =================================================================== | ||
16 | --- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100 | ||
17 | +++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100 | ||
18 | @@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[]) | ||
19 | if (preserve_dates) | ||
20 | set_times (tmpname, &statbuf); | ||
21 | if (output_file != tmpname) | ||
22 | - smart_rename (tmpname, output_file ? output_file : argv[i], | ||
23 | - preserve_dates); | ||
24 | + if (smart_rename (tmpname, output_file ? output_file : argv[i], | ||
25 | + preserve_dates)) | ||
26 | + hold_status = 1; | ||
27 | status = hold_status; | ||
28 | } | ||
29 | else | ||
30 | @@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[]) | ||
31 | if (preserve_dates) | ||
32 | set_times (tmpname, &statbuf); | ||
33 | if (tmpname != output_filename) | ||
34 | - smart_rename (tmpname, input_filename, preserve_dates); | ||
35 | + if (smart_rename (tmpname, input_filename, preserve_dates)) | ||
36 | + status = 1; | ||
37 | } | ||
38 | else | ||
39 | unlink_if_ordinary (tmpname); | ||
diff --git a/meta/packages/binutils/binutils-2.19/binutils-uclibc-100-uclibc-conf.patch b/meta/packages/binutils/binutils-2.19/binutils-uclibc-100-uclibc-conf.patch deleted file mode 100644 index 8de04e0fe0..0000000000 --- a/meta/packages/binutils/binutils-2.19/binutils-uclibc-100-uclibc-conf.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | --- binutils-2.18.orig/configure | ||
2 | +++ binutils-2.18/configure | ||
3 | @@ -2206,7 +2206,7 @@ | ||
4 | am33_2.0-*-linux*) | ||
5 | noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" | ||
6 | ;; | ||
7 | - sh-*-linux*) | ||
8 | + sh*-*-linux*) | ||
9 | noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" | ||
10 | ;; | ||
11 | sh*-*-pe|mips*-*-pe|*arm-wince-pe) | ||
12 | @@ -2504,7 +2504,7 @@ | ||
13 | romp-*-*) | ||
14 | noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" | ||
15 | ;; | ||
16 | - sh-*-* | sh64-*-*) | ||
17 | + sh*-*-* | sh64-*-*) | ||
18 | case "${host}" in | ||
19 | i[3456789]86-*-vsta) ;; # don't add gprof back in | ||
20 | i[3456789]86-*-go32*) ;; # don't add gprof back in | ||
21 | --- binutils-2.18.orig/gprof/configure | ||
22 | +++ binutils-2.18/gprof/configure | ||
23 | @@ -4124,6 +4124,11 @@ | ||
24 | lt_cv_deplibs_check_method=pass_all | ||
25 | ;; | ||
26 | |||
27 | +linux-uclibc*) | ||
28 | + lt_cv_deplibs_check_method=pass_all | ||
29 | + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` | ||
30 | + ;; | ||
31 | + | ||
32 | netbsd*) | ||
33 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | ||
34 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | ||
diff --git a/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-001_ld_makefile_patch.patch deleted file mode 100644 index 04a7e61e25..0000000000 --- a/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-001_ld_makefile_patch.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | ## 001_ld_makefile_patch.dpatch | ||
3 | ## | ||
4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
5 | ## DP: Description: correct where ld scripts are installed | ||
6 | ## DP: Author: Chris Chimelis <chris@debian.org> | ||
7 | ## DP: Upstream status: N/A | ||
8 | ## DP: Date: ?? | ||
9 | |||
10 | if [ $# -ne 1 ]; then | ||
11 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
12 | exit 1 | ||
13 | fi | ||
14 | |||
15 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | ||
16 | patch_opts="${patch_opts:--f --no-backup-if-mismatch}" | ||
17 | |||
18 | case "$1" in | ||
19 | -patch) patch $patch_opts -p1 < $0;; | ||
20 | -unpatch) patch $patch_opts -p1 -R < $0;; | ||
21 | *) | ||
22 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
23 | exit 1;; | ||
24 | esac | ||
25 | |||
26 | exit 0 | ||
27 | |||
28 | @DPATCH@ | ||
29 | --- binutils-2.16.91.0.1/ld/Makefile.am | ||
30 | +++ binutils-2.16.91.0.1/ld/Makefile.am | ||
31 | @@ -20,7 +20,7 @@ | ||
32 | # We put the scripts in the directory $(scriptdir)/ldscripts. | ||
33 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | ||
34 | # directives need to be different for native and cross linkers. | ||
35 | -scriptdir = $(tooldir)/lib | ||
36 | +scriptdir = $(libdir) | ||
37 | |||
38 | EMUL = @EMUL@ | ||
39 | EMULATION_OFILES = @EMULATION_OFILES@ | ||
40 | --- binutils-2.16.91.0.1/ld/Makefile.in | ||
41 | +++ binutils-2.16.91.0.1/ld/Makefile.in | ||
42 | @@ -268,7 +268,7 @@ | ||
43 | # We put the scripts in the directory $(scriptdir)/ldscripts. | ||
44 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | ||
45 | # directives need to be different for native and cross linkers. | ||
46 | -scriptdir = $(tooldir)/lib | ||
47 | +scriptdir = $(libdir) | ||
48 | BASEDIR = $(srcdir)/.. | ||
49 | BFDDIR = $(BASEDIR)/bfd | ||
50 | INCDIR = $(BASEDIR)/include | ||
diff --git a/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-006_better_file_error.patch b/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-006_better_file_error.patch deleted file mode 100644 index f337611edf..0000000000 --- a/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-006_better_file_error.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | ## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com> | ||
3 | ## | ||
4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
5 | ## DP: Specify which filename is causing an error if the filename is a | ||
6 | ## DP: directory. (#45832) | ||
7 | |||
8 | if [ $# -ne 1 ]; then | ||
9 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
10 | exit 1 | ||
11 | fi | ||
12 | |||
13 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | ||
14 | patch_opts="${patch_opts:--f --no-backup-if-mismatch}" | ||
15 | |||
16 | case "$1" in | ||
17 | -patch) patch $patch_opts -p1 < $0;; | ||
18 | -unpatch) patch $patch_opts -p1 -R < $0;; | ||
19 | *) | ||
20 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
21 | exit 1;; | ||
22 | esac | ||
23 | |||
24 | exit 0 | ||
25 | |||
26 | @DPATCH@ | ||
27 | diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c | ||
28 | --- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 | ||
29 | +++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 | ||
30 | @@ -150,6 +150,13 @@ | ||
31 | { | ||
32 | bfd *nbfd; | ||
33 | const bfd_target *target_vec; | ||
34 | + struct stat s; | ||
35 | + | ||
36 | + if (stat (filename, &s) == 0) | ||
37 | + if (S_ISDIR(s.st_mode)) { | ||
38 | + bfd_set_error (bfd_error_file_not_recognized); | ||
39 | + return NULL; | ||
40 | + } | ||
41 | |||
42 | nbfd = _bfd_new_bfd (); | ||
43 | if (nbfd == NULL) | ||
diff --git a/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-012_check_ldrunpath_length.patch deleted file mode 100644 index 498651a90c..0000000000 --- a/meta/packages/binutils/binutils-2.19/binutils-uclibc-300-012_check_ldrunpath_length.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | ## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org> | ||
3 | ## | ||
4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
5 | ## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for | ||
6 | ## DP: cases where -rpath isn't specified. (#151024) | ||
7 | |||
8 | if [ $# -ne 1 ]; then | ||
9 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
10 | exit 1 | ||
11 | fi | ||
12 | |||
13 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | ||
14 | patch_opts="${patch_opts:--f --no-backup-if-mismatch}" | ||
15 | |||
16 | case "$1" in | ||
17 | -patch) patch $patch_opts -p1 < $0;; | ||
18 | -unpatch) patch $patch_opts -p1 -R < $0;; | ||
19 | *) | ||
20 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
21 | exit 1;; | ||
22 | esac | ||
23 | |||
24 | exit 0 | ||
25 | |||
26 | @DPATCH@ | ||
27 | diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em | ||
28 | --- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100 | ||
29 | +++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100 | ||
30 | @@ -692,6 +692,8 @@ | ||
31 | && command_line.rpath == NULL) | ||
32 | { | ||
33 | lib_path = (const char *) getenv ("LD_RUN_PATH"); | ||
34 | + if ((lib_path) && (strlen (lib_path) == 0)) | ||
35 | + lib_path = NULL; | ||
36 | if (gld${EMULATION_NAME}_search_needed (lib_path, &n, | ||
37 | force)) | ||
38 | break; | ||
39 | @@ -871,6 +873,8 @@ | ||
40 | rpath = command_line.rpath; | ||
41 | if (rpath == NULL) | ||
42 | rpath = (const char *) getenv ("LD_RUN_PATH"); | ||
43 | + if ((rpath) && (strlen (rpath) == 0)) | ||
44 | + rpath = NULL; | ||
45 | if (! (bfd_elf_size_dynamic_sections | ||
46 | (output_bfd, command_line.soname, rpath, | ||
47 | command_line.filter_shlib, | ||
diff --git a/meta/packages/binutils/binutils-2.19/binutils-uclibc-gas-needs-libm.patch b/meta/packages/binutils/binutils-2.19/binutils-uclibc-gas-needs-libm.patch deleted file mode 100644 index db838cf20c..0000000000 --- a/meta/packages/binutils/binutils-2.19/binutils-uclibc-gas-needs-libm.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Source: Khem Raj <raj.khem@gmail.com> | ||
2 | Disposition: submit upstream. | ||
3 | |||
4 | Description: | ||
5 | |||
6 | We do not need to have the libtool patch anymore for binutils after | ||
7 | libtool has been updated upstream it include support for it. However | ||
8 | for building gas natively on uclibc systems we have to link it with | ||
9 | -lm so that it picks up missing symbols. | ||
10 | |||
11 | /local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_from_double': | ||
12 | floatformat.c:(.text+0x1ec): undefined reference to `frexp' | ||
13 | floatformat.c:(.text+0x2f8): undefined reference to `ldexp' | ||
14 | /local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_to_double': | ||
15 | floatformat.c:(.text+0x38a): undefined reference to `ldexp' | ||
16 | floatformat.c:(.text+0x3d2): undefined reference to `ldexp' | ||
17 | floatformat.c:(.text+0x43e): undefined reference to `ldexp' floatformat.c:(.text+0x4e2): undefined reference to `ldexp' | ||
18 | collect2: ld returned 1 exit status | ||
19 | make[4]: *** [as-new] Error 1 | ||
20 | |||
21 | Index: binutils-2.17.50/gas/configure.tgt | ||
22 | =================================================================== | ||
23 | --- binutils-2.17.50.orig/gas/configure.tgt | ||
24 | +++ binutils-2.17.50/gas/configure.tgt | ||
25 | @@ -408,6 +408,12 @@ case ${generic_target} in | ||
26 | *-*-netware) fmt=elf em=netware ;; | ||
27 | esac | ||
28 | |||
29 | +case ${generic_target} in | ||
30 | + arm-*-*uclibc*) | ||
31 | + need_libm=yes | ||
32 | + ;; | ||
33 | +esac | ||
34 | + | ||
35 | case ${cpu_type} in | ||
36 | alpha | arm | i386 | ia64 | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k) | ||
37 | bfd_gas=yes | ||
38 | |||
diff --git a/meta/packages/binutils/binutils-2.19/libtool.patch b/meta/packages/binutils/binutils-2.19/libtool.patch deleted file mode 100644 index 81289f3006..0000000000 --- a/meta/packages/binutils/binutils-2.19/libtool.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | A command like /bin/sh ../../i586-poky-linux-libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio) | ||
2 | |||
3 | This is because libdir has a trailing slash which breaks the comparision. | ||
4 | |||
5 | RP 2/1/10 | ||
6 | |||
7 | Index: binutils-2.19/ltmain.sh | ||
8 | =================================================================== | ||
9 | --- binutils-2.19.orig/ltmain.sh 2007-05-25 20:56:24.000000000 +0100 | ||
10 | +++ binutils-2.19/ltmain.sh 2010-02-10 22:49:07.191629027 +0000 | ||
11 | @@ -2320,8 +2320,12 @@ | ||
12 | dir="$dir$objdir" | ||
13 | |||
14 | if test -n "$relink_command"; then | ||
15 | + # Strip any trailing slash from the destination. | ||
16 | + func_stripname '' '/' "$libdir" | ||
17 | + destlibdir=$func_stripname_result | ||
18 | + | ||
19 | # Determine the prefix the user has applied to our future dir. | ||
20 | - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` | ||
21 | + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"` | ||
22 | |||
23 | # Don't allow the user to place us outside of our expected | ||
24 | # location b/c this prevents finding dependent libraries that | ||
25 | @@ -3958,8 +3962,14 @@ | ||
26 | absdir="$abs_ladir" | ||
27 | libdir="$abs_ladir" | ||
28 | else | ||
29 | - dir="$libdir" | ||
30 | - absdir="$libdir" | ||
31 | + # Adding 'libdir' from the .la file to our library search paths | ||
32 | + # breaks crosscompilation horribly. We cheat here and don't add | ||
33 | + # it, instead adding the path where we found the .la. -CL | ||
34 | + dir="$abs_ladir" | ||
35 | + absdir="$abs_ladir" | ||
36 | + libdir="$abs_ladir" | ||
37 | + #dir="$libdir" | ||
38 | + #absdir="$libdir" | ||
39 | fi | ||
40 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes | ||
41 | else | ||
42 | @@ -4329,8 +4339,6 @@ | ||
43 | add="$libdir/$linklib" | ||
44 | fi | ||
45 | else | ||
46 | - # We cannot seem to hardcode it, guess we'll fake it. | ||
47 | - add_dir="-L$libdir" | ||
48 | # Try looking first in the location we're being installed to. | ||
49 | if test -n "$inst_prefix_dir"; then | ||
50 | case $libdir in | ||
51 | @@ -4478,7 +4486,17 @@ | ||
52 | fi | ||
53 | ;; | ||
54 | *) | ||
55 | - path="-L$absdir/$objdir" | ||
56 | + # OE sets installed=no in staging. We need to look in $objdir and $absdir, | ||
57 | + # preferring $objdir. RP 31/04/2008 | ||
58 | + if test -f "$absdir/$objdir/$depdepl" ; then | ||
59 | + depdepl="$absdir/$objdir/$depdepl" | ||
60 | + path="-L$absdir/$objdir" | ||
61 | + elif test -f "$absdir/$depdepl" ; then | ||
62 | + depdepl="$absdir/$depdepl" | ||
63 | + path="-L$absdir" | ||
64 | + else | ||
65 | + path="-L$absdir/$objdir" | ||
66 | + fi | ||
67 | ;; | ||
68 | esac | ||
69 | else | ||
diff --git a/meta/packages/binutils/binutils-cross-canadian_2.18.bb b/meta/packages/binutils/binutils-cross-canadian_2.18.bb deleted file mode 100644 index f4a7a0e619..0000000000 --- a/meta/packages/binutils/binutils-cross-canadian_2.18.bb +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | require binutils_${PV}.bb | ||
2 | require binutils-cross-canadian.inc | ||
3 | PR = "r4" | ||
diff --git a/meta/packages/binutils/binutils-cross-canadian_2.19.bb b/meta/packages/binutils/binutils-cross-canadian_2.19.bb deleted file mode 100644 index 7dad2a620b..0000000000 --- a/meta/packages/binutils/binutils-cross-canadian_2.19.bb +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | require binutils_${PV}.bb | ||
2 | require binutils-cross-canadian.inc | ||
3 | PR = "r0" | ||
diff --git a/meta/packages/binutils/binutils-cross_2.18.bb b/meta/packages/binutils/binutils-cross_2.18.bb deleted file mode 100644 index a8a74493dc..0000000000 --- a/meta/packages/binutils/binutils-cross_2.18.bb +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | require binutils_${PV}.bb | ||
2 | require binutils-cross.inc | ||
3 | PR = "r2" | ||
diff --git a/meta/packages/binutils/binutils-cross_2.19.bb b/meta/packages/binutils/binutils-cross_2.19.bb deleted file mode 100644 index 8c7e4bc1a3..0000000000 --- a/meta/packages/binutils/binutils-cross_2.19.bb +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | require binutils_${PV}.bb | ||
2 | require binutils-cross.inc | ||
3 | |||
diff --git a/meta/packages/binutils/binutils-crosssdk_2.19.bb b/meta/packages/binutils/binutils-crosssdk_2.19.bb deleted file mode 100644 index 8a9275003f..0000000000 --- a/meta/packages/binutils/binutils-crosssdk_2.19.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | require binutils-cross_${PV}.bb | ||
2 | |||
3 | inherit crosssdk | ||
4 | |||
5 | PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" | ||
6 | |||
7 | PR = "r1" | ||
8 | |||
9 | do_configure_prepend () { | ||
10 | sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATH}/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt | ||
11 | } | ||
12 | |||
diff --git a/meta/packages/binutils/binutils_2.18.bb b/meta/packages/binutils/binutils_2.18.bb deleted file mode 100644 index 7e4afe40f2..0000000000 --- a/meta/packages/binutils/binutils_2.18.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | require binutils.inc | ||
2 | |||
3 | PR = "r1" | ||
4 | |||
5 | SRC_URI = "\ | ||
6 | ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ | ||
7 | file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ | ||
8 | file://binutils-configure-texinfo-version.patch;patch=1 \ | ||
9 | file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ | ||
10 | file://110-arm-eabi-conf.patch;patch=1 \ | ||
11 | file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ | ||
12 | file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ | ||
13 | file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ | ||
14 | " | ||
diff --git a/meta/packages/binutils/binutils_2.19.bb b/meta/packages/binutils/binutils_2.19.bb deleted file mode 100644 index 65a6aa102c..0000000000 --- a/meta/packages/binutils/binutils_2.19.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | PR = "r1" | ||
2 | |||
3 | require binutils.inc | ||
4 | |||
5 | SRC_URI = "\ | ||
6 | ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ | ||
7 | file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ | ||
8 | file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ | ||
9 | file://110-arm-eabi-conf.patch;patch=1 \ | ||
10 | file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ | ||
11 | file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ | ||
12 | file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ | ||
13 | file://binutils-uclibc-gas-needs-libm.patch;patch=1 \ | ||
14 | file://libtool.patch;patch=1 \ | ||
15 | " | ||
16 | |||
17 | # powerpc patches | ||
18 | SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1" | ||
19 | |||