summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <paul@betafive.co.uk>2019-03-09 18:06:41 +0000
committerPaul Barker <paul@betafive.co.uk>2019-03-09 18:06:43 +0000
commit852685c994aaffa0ac4581451716fa555ed3ef49 (patch)
treec786405d32438a6cc993994b86bef0e8720b5184
parent1b990fb8e2c21fdfac97c72d471e658087ce7026 (diff)
downloadmeta-raspberrypi-852685c994aaffa0ac4581451716fa555ed3ef49.tar.gz
linux-raspberrypi 4.14: Refresh patch
The patch does not cleanly apply to the current 4.14.y kernel. Signed-off-by: Paul Barker <paul@betafive.co.uk>
-rw-r--r--recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch b/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
index a9e9213..6d8c839 100644
--- a/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
+++ b/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
@@ -1,4 +1,4 @@
1From e6ebc8e654bba53f28af5229a1069fc74fa58b7b Mon Sep 17 00:00:00 2001 1From c0293d0723851e8958ca7d626ca1b7a8ad2b63b0 Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 25 Sep 2014 11:26:49 -0700 3Date: Thu, 25 Sep 2014 11:26:49 -0700
4Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses 4Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses
@@ -32,10 +32,10 @@ Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
32diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh 32diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
33old mode 100755 33old mode 100755
34new mode 100644 34new mode 100644
35index 5075ebf2d3b9..ba9242101190 35index a10bd9d6fafd..1520dc04d399
36--- a/scripts/kconfig/lxdialog/check-lxdialog.sh 36--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
37+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh 37+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
38@@ -4,6 +4,10 @@ 38@@ -5,6 +5,10 @@
39 # What library to link 39 # What library to link
40 ldflags() 40 ldflags()
41 { 41 {
@@ -46,7 +46,7 @@ index 5075ebf2d3b9..ba9242101190
46 pkg-config --libs ncursesw 2>/dev/null && exit 46 pkg-config --libs ncursesw 2>/dev/null && exit
47 pkg-config --libs ncurses 2>/dev/null && exit 47 pkg-config --libs ncurses 2>/dev/null && exit
48 for ext in so a dll.a dylib ; do 48 for ext in so a dll.a dylib ; do
49@@ -21,6 +25,10 @@ ldflags() 49@@ -22,6 +26,10 @@ ldflags()
50 # Where is ncurses.h? 50 # Where is ncurses.h?
51 ccflags() 51 ccflags()
52 { 52 {
@@ -58,5 +58,5 @@ index 5075ebf2d3b9..ba9242101190
58 echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1' 58 echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
59 elif pkg-config --cflags ncurses 2>/dev/null; then 59 elif pkg-config --cflags ncurses 2>/dev/null; then
60-- 60--
612.14.3 612.17.1
62 62