]>
Commit | Line | Data |
---|---|---|
0b1ff5c3 JR |
1 | diff -urNp -x '*.orig' linux-4.14/scripts/kconfig/lxdialog/check-lxdialog.sh linux-4.14/scripts/kconfig/lxdialog/check-lxdialog.sh |
2 | --- linux-4.14/scripts/kconfig/lxdialog/check-lxdialog.sh 2017-11-12 19:46:13.000000000 +0100 | |
3 | +++ linux-4.14/scripts/kconfig/lxdialog/check-lxdialog.sh 2021-02-24 21:43:55.011102640 +0100 | |
4 | @@ -12,6 +12,12 @@ ldflags() | |
2136e199 AM |
5 | $cc -print-file-name=lib${lib}.${ext} | grep -q / |
6 | if [ $? -eq 0 ]; then | |
7 | echo "-l${lib}" | |
8 | + for libt in tinfow tinfo ; do | |
9 | + $cc -print-file-name=lib${libt}.${ext} | grep -q / | |
10 | + if [ $? -eq 0 ]; then | |
11 | + echo "-l${libt}" | |
12 | + fi | |
13 | + done | |
14 | exit | |
15 | fi | |
16 | done | |
0b1ff5c3 JR |
17 | diff -urNp -x '*.orig' linux-4.14/scripts/mod/modpost.c linux-4.14/scripts/mod/modpost.c |
18 | --- linux-4.14/scripts/mod/modpost.c 2021-02-24 21:43:47.051093387 +0100 | |
19 | +++ linux-4.14/scripts/mod/modpost.c 2021-02-24 21:43:55.011102640 +0100 | |
20 | @@ -19,7 +19,8 @@ | |
21 | #include <stdbool.h> | |
22 | #include <errno.h> | |
23 | #include "modpost.h" | |
24 | -#include "../../include/generated/autoconf.h" | |
25 | +// PLD architectures don't use CONFIG_SYMBOL_PREFIX | |
26 | +//#include "../../include/generated/autoconf.h" | |
27 | #include "../../include/linux/license.h" | |
28 | #include "../../include/linux/export.h" | |
29 | ||
30 | diff -urNp -x '*.orig' linux-4.14/security/selinux/include/classmap.h linux-4.14/security/selinux/include/classmap.h | |
31 | --- linux-4.14/security/selinux/include/classmap.h 2021-02-24 21:43:47.054426725 +0100 | |
32 | +++ linux-4.14/security/selinux/include/classmap.h 2021-02-24 21:43:55.011102640 +0100 | |
33 | @@ -239,9 +239,11 @@ struct security_class_mapping secclass_m | |
32689a6e JR |
34 | { "access", NULL } }, |
35 | { "infiniband_endport", | |
36 | { "manage_subnet", NULL } }, | |
37 | + { "xdp_socket", | |
38 | + { COMMON_SOCK_PERMS, NULL } }, | |
39 | { NULL } | |
40 | }; | |
41 | ||
42 | -#if PF_MAX > 44 | |
43 | +#if PF_MAX > 45 | |
44 | #error New address family defined, please update secclass_map. | |
45 | #endif |