diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2017-10-03 17:38:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:21 +0000 |
commit | 3bbc1577d92d2e56354a34a774e702418c82c2aa (patch) | |
tree | 8297b0b46c3fb5cc67a84cee4d489a36dfc31858 /meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch | |
parent | 7515e9f0bca31aaaf7460701101baf22808fd46a (diff) | |
download | poky-3bbc1577d92d2e56354a34a774e702418c82c2aa.tar.gz |
busybox: 1.24.1 -> 1.27.2
- fixed link creation to shell
- reported bug with suid shells [https://bugs.busybox.net/show_bug.cgi?id=10346]
- removed and modified already merged patches
- updated defconfig regarding to new version
(From OE-Core rev: 55740077a1f3bed5956fe02ef17ba1d99176ea24)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch b/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch index bda86859dc..6faca227f7 100644 --- a/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch +++ b/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch | |||
@@ -33,7 +33,7 @@ cc: linux-kbuild@vger.kernel.org | |||
33 | scripts/kconfig/lxdialog/Makefile | 2 +- | 33 | scripts/kconfig/lxdialog/Makefile | 2 +- |
34 | scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++ | 34 | scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++ |
35 | 2 files changed, 9 insertions(+), 1 deletion(-) | 35 | 2 files changed, 9 insertions(+), 1 deletion(-) |
36 | 36 | ||
37 | --- a/scripts/kconfig/lxdialog/check-lxdialog.sh | 37 | --- a/scripts/kconfig/lxdialog/check-lxdialog.sh |
38 | +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh | 38 | +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh |
39 | @@ -4,6 +4,10 @@ | 39 | @@ -4,6 +4,10 @@ |
@@ -44,10 +44,10 @@ cc: linux-kbuild@vger.kernel.org | |||
44 | + echo "$CROSS_CURSES_LIB" | 44 | + echo "$CROSS_CURSES_LIB" |
45 | + exit | 45 | + exit |
46 | + fi | 46 | + fi |
47 | for ext in so a dylib ; do | 47 | pkg-config --libs ncursesw 2>/dev/null && exit |
48 | for lib in ncursesw ncurses curses ; do | 48 | pkg-config --libs ncurses 2>/dev/null && exit |
49 | $cc -print-file-name=lib${lib}.${ext} | grep -q / | 49 | for ext in so a dll.a dylib ; do |
50 | @@ -19,6 +23,10 @@ ldflags() | 50 | @@ -21,6 +25,10 @@ |
51 | # Where is ncurses.h? | 51 | # Where is ncurses.h? |
52 | ccflags() | 52 | ccflags() |
53 | { | 53 | { |
@@ -55,12 +55,12 @@ cc: linux-kbuild@vger.kernel.org | |||
55 | + echo "$CROSS_CURSES_INC" | 55 | + echo "$CROSS_CURSES_INC" |
56 | + exit | 56 | + exit |
57 | + fi | 57 | + fi |
58 | if [ -f /usr/include/ncursesw/ncurses.h ]; then | 58 | if pkg-config --cflags ncursesw 2>/dev/null; then |
59 | echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"' | 59 | echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1' |
60 | elif [ -f /usr/include/ncursesw/curses.h ]; then | 60 | elif pkg-config --cflags ncurses 2>/dev/null; then |
61 | --- a/scripts/kconfig/lxdialog/Makefile | 61 | --- a/scripts/kconfig/lxdialog/Makefile |
62 | +++ b/scripts/kconfig/lxdialog/Makefile | 62 | +++ b/scripts/kconfig/lxdialog/Makefile |
63 | @@ -5,7 +5,7 @@ check-lxdialog := $(srctree)/$(src)/che | 63 | @@ -5,7 +5,7 @@ |
64 | 64 | ||
65 | # Use reursively expanded variables so we do not call gcc unless | 65 | # Use reursively expanded variables so we do not call gcc unless |
66 | # we really need to do so. (Do not call gcc as part of make mrproper) | 66 | # we really need to do so. (Do not call gcc as part of make mrproper) |