mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

at: upgrade to 3.1.23

Browse Source 
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>
This commit is contained in:
Chen Qi
2018-12-05 16:40:46 +08:00
committed by Richard Purdie
parent 8a0fb932e9
commit 9661c03d68
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/at/at/fix_parallel_build_error.patch
+10 -5
View File
@@ -1,3 +1,8 @@
From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Wed, 5 Dec 2018 09:46:22 +0800
Subject: [PATCH] fix parallel build error
make -j was failing sometimesa like this
| 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
| parsetime.l:5:19: fatal error: y.tab.h: No such file or directory
@@ -12,24 +17,24 @@ Nitin <nitin.a.kamble@intel.com>
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
Makefile.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Makefile.in b/Makefile.in
index dd3c2f8..7897e45 100644
index 4c11913..18ecc23 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,6 +82,8 @@ y.tab.c y.tab.h: parsetime.y
@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y
lex.yy.c: parsetime.l
$(LEX) -i parsetime.l
+parsetime.l: y.tab.h
+
atd.service: atd.service.in
sed -e 's![@]sbindir[@]!$(sbindir)!g' < $< > $@
cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@
--
1.9.1
2.7.4
meta/recipes-extended/at/at/pam.conf.patch
+24 -16
View File
@@ -1,27 +1,35 @@
From 8c8a0b6ba199327d2eafefd6611353e1c483a854 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Wed, 5 Dec 2018 10:00:36 +0800
Subject: [PATCH] fix pam.conf
oe doesn't support "@include", use the concrete directive instead.
Upstream-Status: Pending
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Index: at-3.1.15/pam.conf
===================================================================
--- at-3.1.15.orig/pam.conf
+++ at-3.1.15/pam.conf
@@ -1,10 +1,11 @@
#
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
pam.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pam.conf b/pam.conf
index 3674c0a..2f8d586 100644
--- a/pam.conf
+++ b/pam.conf
@@ -2,9 +2,9 @@
# The PAM configuration file for the at daemon
#
+
+auth required pam_env.so
+auth include common-auth
+account include common-account
+session include common-session-noninteractive
+session required pam_limits.so
+session required pam_loginuid.so
-auth required pam_env.so
-@include common-auth
-@include common-account
-session required pam_loginuid.so
+auth include common-auth
+acount include common-account
session required pam_loginuid.so
-@include common-session-noninteractive
-session required pam_limits.so
+session include common-session-noninteractive
session required pam_limits.so
auth required pam_env.so user_readenv=1
--
2.7.4
meta/recipes-extended/at/at_3.1.20.bb → meta/recipes-extended/at/at_3.1.23.bb
+3 -3
View File
@@ -22,7 +22,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
RCONFLICTS_${PN} = "atd"
RREPLACES_${PN} = "atd"
SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \
SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \
file://fix_parallel_build_error.patch \
file://posixtm.c \
file://posixtm.h \
@@ -37,8 +37,8 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/
PAM_SRC_URI = "file://pam.conf.patch \
file://configure-add-enable-pam.patch"
SRC_URI[md5sum] = "e7bd7b785b2cbb17e133d6bdc0fb099e"
SRC_URI[sha256sum] = "0871923cab73050b98ace020664eb2ddc1e669e4166b5abb64d864d02fcefab9"
SRC_URI[md5sum] = "1cec945506b5ddf1d776c92c315fc581"
SRC_URI[sha256sum] = "97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710"
UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/"