1 files changed, 68 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0064-kconfig-streamline-config.pl-Simplify-backslash-line.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0064-kconfig-streamline-config.pl-Simplify-backslash-line.patch
new file mode 100644
index 00000000..8d788a5a
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0064-kconfig-streamline-config.pl-Simplify-backslash-line.patch
@@ -0,0 +1,68 @@
+From 700e5b37d0da1b3688992c53abba2ba9c123c547 Mon Sep 17 00:00:00 2001
+From: Steven Rostedt <srostedt@redhat.com>
+Date: Fri, 13 Jan 2012 17:50:39 -0500
+Subject: [PATCH 064/130] kconfig/streamline-config.pl: Simplify backslash
+ line concatination
+
+commit d060d963e88f3e990cec2fe5214de49de9a49eca upstream.
+
+Simplify the way lines ending with backslashes (continuation) in Makefiles
+is parsed. This is needed to implement a necessary fix.
+
+Tested-by: Thomas Lange <thomas-lange2@gmx.de>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ scripts/kconfig/streamline_config.pl |   25 ++++++++++++-------------
+ 1 files changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
+index ec7afce..42ef5ea 100644
+--- a/scripts/kconfig/streamline_config.pl
++++ b/scripts/kconfig/streamline_config.pl
+@@ -253,17 +253,22 @@ if ($kconfig) {
+ # Read all Makefiles to map the configs to the objects
+ foreach my $makefile (@makefiles) {
+ 
+-    my $cont = 0;
++    my $line = "";
+ 
+     open(MIN,$makefile) || die "Can't open $makefile";
+     while (<MIN>) {
+-       my $objs;
+-
+-       # is this a line after a line with a backslash?
+-       if ($cont && /(\S.*)$/) {
+-           $objs = $1;
++       # if this line ends with a backslash, continue
++       chomp;
++       if (/^(.*)\\$/) {
++           $line .= $1;
++           next;
+        }
+-       $cont = 0;
++
++       $line .= $_;
++       $_ = $line;
++       $line = "";
++
++       my $objs;
+ 
+        # collect objects after obj-$(CONFIG_FOO_BAR)
+        if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
+@@ -271,12 +276,6 @@ foreach my $makefile (@makefiles) {
+            $objs = $2;
+        }
+        if (defined($objs)) {
+-           # test if the line ends with a backslash
+-           if ($objs =~ m,(.*)\\$,) {
+-               $objs = $1;
+-               $cont = 1;
+-           }
+-
+            foreach my $obj (split /\s+/,$objs) {
+                $obj =~ s/-/_/g;
+                if ($obj =~ /(.*)\.o$/) {
+-- 
+1.7.7.4
+