diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-12-05 16:40:46 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-05 22:30:19 +0000 |
commit | 9661c03d684578d1f000ec9cd3c550e9aef78551 (patch) | |
tree | 2cdc8d868dc1dc0f1b9f15c33532b37a5efa6194 /meta/recipes-extended/at/at | |
parent | 8a0fb932e975c63ce5db2a95cb7cc1c3c33967db (diff) | |
download | poky-9661c03d684578d1f000ec9cd3c550e9aef78551.tar.gz |
at: upgrade to 3.1.23
The following patches are rebased.
fix_parallel_build_error.patch
pam.conf.patch
(From OE-Core rev: 30fa97ec4c9d0553f1566bc26a6949e93cb6da90)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/at/at')
-rw-r--r-- | meta/recipes-extended/at/at/fix_parallel_build_error.patch | 15 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/pam.conf.patch | 40 |
2 files changed, 34 insertions, 21 deletions
diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/meta/recipes-extended/at/at/fix_parallel_build_error.patch index 100f8898e0..30d2324126 100644 --- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ b/meta/recipes-extended/at/at/fix_parallel_build_error.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 5 Dec 2018 09:46:22 +0800 | ||
4 | Subject: [PATCH] fix parallel build error | ||
5 | |||
1 | make -j was failing sometimesa like this | 6 | make -j was failing sometimesa like this |
2 | | ccache i586-poky-linux-gcc -march=i586 --sysroot=/home/nitin/build/build0/tmp/sysroots/i586-poky-linux -I. -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -o atd atd.o daemon.o -lfl -lpam -Wl,-O1 -Wl,--as-needed | 7 | | ccache i586-poky-linux-gcc -march=i586 --sysroot=/home/nitin/build/build0/tmp/sysroots/i586-poky-linux -I. -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -o atd atd.o daemon.o -lfl -lpam -Wl,-O1 -Wl,--as-needed |
3 | | parsetime.l:5:19: fatal error: y.tab.h: No such file or directory | 8 | | parsetime.l:5:19: fatal error: y.tab.h: No such file or directory |
@@ -12,24 +17,24 @@ Nitin <nitin.a.kamble@intel.com> | |||
12 | Upstream-Status: Pending | 17 | Upstream-Status: Pending |
13 | 18 | ||
14 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 19 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
15 | 20 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |
16 | --- | 21 | --- |
17 | Makefile.in | 2 ++ | 22 | Makefile.in | 2 ++ |
18 | 1 file changed, 2 insertions(+) | 23 | 1 file changed, 2 insertions(+) |
19 | 24 | ||
20 | diff --git a/Makefile.in b/Makefile.in | 25 | diff --git a/Makefile.in b/Makefile.in |
21 | index dd3c2f8..7897e45 100644 | 26 | index 4c11913..18ecc23 100644 |
22 | --- a/Makefile.in | 27 | --- a/Makefile.in |
23 | +++ b/Makefile.in | 28 | +++ b/Makefile.in |
24 | @@ -82,6 +82,8 @@ y.tab.c y.tab.h: parsetime.y | 29 | @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y |
25 | lex.yy.c: parsetime.l | 30 | lex.yy.c: parsetime.l |
26 | $(LEX) -i parsetime.l | 31 | $(LEX) -i parsetime.l |
27 | 32 | ||
28 | +parsetime.l: y.tab.h | 33 | +parsetime.l: y.tab.h |
29 | + | 34 | + |
30 | atd.service: atd.service.in | 35 | atd.service: atd.service.in |
31 | sed -e 's![@]sbindir[@]!$(sbindir)!g' < $< > $@ | 36 | cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ |
32 | 37 | ||
33 | -- | 38 | -- |
34 | 1.9.1 | 39 | 2.7.4 |
35 | 40 | ||
diff --git a/meta/recipes-extended/at/at/pam.conf.patch b/meta/recipes-extended/at/at/pam.conf.patch index b5ceb9ae82..c9f337ede0 100644 --- a/meta/recipes-extended/at/at/pam.conf.patch +++ b/meta/recipes-extended/at/at/pam.conf.patch | |||
@@ -1,27 +1,35 @@ | |||
1 | From 8c8a0b6ba199327d2eafefd6611353e1c483a854 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 5 Dec 2018 10:00:36 +0800 | ||
4 | Subject: [PATCH] fix pam.conf | ||
5 | |||
1 | oe doesn't support "@include", use the concrete directive instead. | 6 | oe doesn't support "@include", use the concrete directive instead. |
2 | 7 | ||
3 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
4 | 9 | ||
5 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 10 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
6 | Index: at-3.1.15/pam.conf | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
7 | =================================================================== | 12 | --- |
8 | --- at-3.1.15.orig/pam.conf | 13 | pam.conf | 6 +++--- |
9 | +++ at-3.1.15/pam.conf | 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
10 | @@ -1,10 +1,11 @@ | 15 | |
11 | # | 16 | diff --git a/pam.conf b/pam.conf |
17 | index 3674c0a..2f8d586 100644 | ||
18 | --- a/pam.conf | ||
19 | +++ b/pam.conf | ||
20 | @@ -2,9 +2,9 @@ | ||
12 | # The PAM configuration file for the at daemon | 21 | # The PAM configuration file for the at daemon |
13 | # | 22 | # |
14 | + | ||
15 | +auth required pam_env.so | ||
16 | +auth include common-auth | ||
17 | +account include common-account | ||
18 | +session include common-session-noninteractive | ||
19 | +session required pam_limits.so | ||
20 | +session required pam_loginuid.so | ||
21 | 23 | ||
22 | -auth required pam_env.so | ||
23 | -@include common-auth | 24 | -@include common-auth |
24 | -@include common-account | 25 | -@include common-account |
25 | -session required pam_loginuid.so | 26 | +auth include common-auth |
27 | +acount include common-account | ||
28 | session required pam_loginuid.so | ||
26 | -@include common-session-noninteractive | 29 | -@include common-session-noninteractive |
27 | -session required pam_limits.so | 30 | +session include common-session-noninteractive |
31 | session required pam_limits.so | ||
32 | auth required pam_env.so user_readenv=1 | ||
33 | -- | ||
34 | 2.7.4 | ||
35 | |||