diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-09-02 11:46:08 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-09-02 11:46:08 -0400 |
commit | 681ccdb175fc8fd5ca7796cb0535d17d1b6f0bb6 (patch) | |
tree | d966bf261463886b143c891f1ebab2af557ba6de /recipes-extended/xen/files | |
parent | 1dcd6c6406bca09ba9181795fa0486b67711ebe1 (diff) | |
download | meta-virtualization-681ccdb175fc8fd5ca7796cb0535d17d1b6f0bb6.tar.gz |
xen: remove fuzz from ncurses patch
The ncurses patch was slightly mangled by email, so we devtool
refresh it to fix the fuzz warning.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/xen/files')
-rw-r--r-- | recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch b/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch index 22b67c40..135860ab 100644 --- a/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch +++ b/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch | |||
@@ -1,9 +1,12 @@ | |||
1 | From b300c18ab899b3c899e5405c96c20a32e51d77c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Mon, 2 Jul 2018 23:10:28 -0400 | ||
4 | Subject: [PATCH] xen: Fix menuconfig and add support for config fragments and | ||
5 | |||
1 | Upstream-Status: Xen: Inappropriate [oe specific, cross compile issue] | 6 | Upstream-Status: Xen: Inappropriate [oe specific, cross compile issue] |
2 | Upstream-Status: Kernel: Pending | 7 | Upstream-Status: Kernel: Pending |
3 | Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> | 8 | Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> |
4 | commit e6972e689a980ab28637e94e48c77eeace6abde5 | 9 | commit e6972e689a980ab28637e94e48c77eeace6abde5 |
5 | Author: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
6 | Date: Mon Jul 2 23:10:28 2018 -0400 | ||
7 | 10 | ||
8 | xen/kconfig,menuconfig,mconf-cfg: Allow specification of ncurses location | 11 | xen/kconfig,menuconfig,mconf-cfg: Allow specification of ncurses location |
9 | 12 | ||
@@ -26,16 +29,21 @@ Date: Mon Jul 2 23:10:28 2018 -0400 | |||
26 | cc: linux-kbuild@vger.kernel.org | 29 | cc: linux-kbuild@vger.kernel.org |
27 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 30 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
28 | 31 | ||
32 | --- | ||
33 | xen/tools/kconfig/mconf-cfg.sh | 8 ++++++++ | ||
34 | 1 file changed, 8 insertions(+) | ||
35 | mode change 100755 => 100644 xen/tools/kconfig/mconf-cfg.sh | ||
36 | |||
29 | diff --git a/xen/tools/kconfig/mconf-cfg.sh b/xen/tools/kconfig/mconf-cfg.sh | 37 | diff --git a/xen/tools/kconfig/mconf-cfg.sh b/xen/tools/kconfig/mconf-cfg.sh |
30 | old mode 100755 | 38 | old mode 100755 |
31 | new mode 100644 | 39 | new mode 100644 |
32 | index c812872..65a9b9e | 40 | index c812872d7f..56eb4fc79f |
33 | --- a/xen/tools/kconfig/mconf-cfg.sh | 41 | --- a/xen/tools/kconfig/mconf-cfg.sh |
34 | +++ b/xen/tools/kconfig/mconf-cfg.sh | 42 | +++ b/xen/tools/kconfig/mconf-cfg.sh |
35 | @@ -4,6 +4,14 @@ | 43 | @@ -4,6 +4,14 @@ |
36 | PKG="ncursesw" | 44 | PKG="ncursesw" |
37 | PKG2="ncurses" | 45 | PKG2="ncurses" |
38 | 46 | ||
39 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | 47 | +if [ "$CROSS_CURSES_LIB" != "" ]; then |
40 | + echo libs=\'$CROSS_CURSES_LIB\' | 48 | + echo libs=\'$CROSS_CURSES_LIB\' |
41 | + if [ x"$CROSS_CURSES_INC" != x ]; then | 49 | + if [ x"$CROSS_CURSES_INC" != x ]; then |
@@ -45,5 +53,5 @@ index c812872..65a9b9e | |||
45 | +fi | 53 | +fi |
46 | + | 54 | + |
47 | if [ -n "$(command -v pkg-config)" ]; then | 55 | if [ -n "$(command -v pkg-config)" ]; then |
48 | if pkg-config --exists $PKG; then | 56 | if pkg-config --exists $PKG; then |
49 | echo cflags=\"$(pkg-config --cflags $PKG)\" | 57 | echo cflags=\"$(pkg-config --cflags $PKG)\" |