summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/at/at/fix_parallel_build_error.patch15
-rw-r--r--meta/recipes-extended/at/at/pam.conf.patch40
-rw-r--r--meta/recipes-extended/at/at_3.1.23.bb (renamed from meta/recipes-extended/at/at_3.1.20.bb)6
3 files changed, 37 insertions, 24 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 @@
1From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 5 Dec 2018 09:46:22 +0800
4Subject: [PATCH] fix parallel build error
5
1make -j was failing sometimesa like this 6make -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>
12Upstream-Status: Pending 17Upstream-Status: Pending
13 18
14Signed-off-by: Scott Garman <scott.a.garman@intel.com> 19Signed-off-by: Scott Garman <scott.a.garman@intel.com>
15 20Signed-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
20diff --git a/Makefile.in b/Makefile.in 25diff --git a/Makefile.in b/Makefile.in
21index dd3c2f8..7897e45 100644 26index 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--
341.9.1 392.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 @@
1From 8c8a0b6ba199327d2eafefd6611353e1c483a854 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 5 Dec 2018 10:00:36 +0800
4Subject: [PATCH] fix pam.conf
5
1oe doesn't support "@include", use the concrete directive instead. 6oe doesn't support "@include", use the concrete directive instead.
2 7
3Upstream-Status: Pending 8Upstream-Status: Pending
4 9
5Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 10Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
6Index: at-3.1.15/pam.conf 11Signed-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 # 16diff --git a/pam.conf b/pam.conf
17index 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--
342.7.4
35
diff --git a/meta/recipes-extended/at/at_3.1.20.bb b/meta/recipes-extended/at/at_3.1.23.bb
index b76e83d1d4..b74882d342 100644
--- a/meta/recipes-extended/at/at_3.1.20.bb
+++ b/meta/recipes-extended/at/at_3.1.23.bb
@@ -22,7 +22,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
22RCONFLICTS_${PN} = "atd" 22RCONFLICTS_${PN} = "atd"
23RREPLACES_${PN} = "atd" 23RREPLACES_${PN} = "atd"
24 24
25SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \ 25SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \
26 file://fix_parallel_build_error.patch \ 26 file://fix_parallel_build_error.patch \
27 file://posixtm.c \ 27 file://posixtm.c \
28 file://posixtm.h \ 28 file://posixtm.h \
@@ -37,8 +37,8 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/
37PAM_SRC_URI = "file://pam.conf.patch \ 37PAM_SRC_URI = "file://pam.conf.patch \
38 file://configure-add-enable-pam.patch" 38 file://configure-add-enable-pam.patch"
39 39
40SRC_URI[md5sum] = "e7bd7b785b2cbb17e133d6bdc0fb099e" 40SRC_URI[md5sum] = "1cec945506b5ddf1d776c92c315fc581"
41SRC_URI[sha256sum] = "0871923cab73050b98ace020664eb2ddc1e669e4166b5abb64d864d02fcefab9" 41SRC_URI[sha256sum] = "97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710"
42 42
43UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/" 43UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/"
44 44