summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-01-11 13:58:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 11:54:49 +0000
commitae73be1d4a4382f034bcacdaeb6a22f4d5a7039b (patch)
tree18ab0e1da4f90f3fa2d6d7d99a1b71f48f5f95ee /meta
parent21efab7b2f8702ef9c75b1c13650a92b41b892ca (diff)
downloadpoky-ae73be1d4a4382f034bcacdaeb6a22f4d5a7039b.tar.gz
at: upgrade to 3.18
(From OE-Core rev: c0f613564a0f895f5c3652601f0947ad7495ac81) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/at/at/fix_parallel_build_error.patch21
-rw-r--r--meta/recipes-extended/at/at_3.1.18.bb (renamed from meta/recipes-extended/at/at_3.1.16.bb)6
2 files changed, 17 insertions, 10 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 66ff3e1c11..100f8898e0 100644
--- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch
+++ b/meta/recipes-extended/at/at/fix_parallel_build_error.patch
@@ -13,16 +13,23 @@ Upstream-Status: Pending
13 13
14Signed-off-by: Scott Garman <scott.a.garman@intel.com> 14Signed-off-by: Scott Garman <scott.a.garman@intel.com>
15 15
16Index: at-3.1.12/Makefile.in 16---
17=================================================================== 17 Makefile.in | 2 ++
18--- at-3.1.12.orig/Makefile.in 18 1 file changed, 2 insertions(+)
19+++ at-3.1.12/Makefile.in 19
20@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y 20diff --git a/Makefile.in b/Makefile.in
21index dd3c2f8..7897e45 100644
22--- a/Makefile.in
23+++ b/Makefile.in
24@@ -82,6 +82,8 @@ y.tab.c y.tab.h: parsetime.y
21 lex.yy.c: parsetime.l 25 lex.yy.c: parsetime.l
22 $(LEX) -i parsetime.l 26 $(LEX) -i parsetime.l
23 27
24+parsetime.l: y.tab.h 28+parsetime.l: y.tab.h
25+ 29+
26 atrun: atrun.in 30 atd.service: atd.service.in
27 configure 31 sed -e 's![@]sbindir[@]!$(sbindir)!g' < $< > $@
28 32
33--
341.9.1
35
diff --git a/meta/recipes-extended/at/at_3.1.16.bb b/meta/recipes-extended/at/at_3.1.18.bb
index b11b587fcf..e83ea32825 100644
--- a/meta/recipes-extended/at/at_3.1.16.bb
+++ b/meta/recipes-extended/at/at_3.1.18.bb
@@ -15,7 +15,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
15RCONFLICTS_${PN} = "atd" 15RCONFLICTS_${PN} = "atd"
16RREPLACES_${PN} = "atd" 16RREPLACES_${PN} = "atd"
17 17
18SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ 18SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz;subdir=${BP} \
19 file://fix_parallel_build_error.patch \ 19 file://fix_parallel_build_error.patch \
20 file://posixtm.c \ 20 file://posixtm.c \
21 file://posixtm.h \ 21 file://posixtm.h \
@@ -30,8 +30,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
30PAM_SRC_URI = "file://pam.conf.patch \ 30PAM_SRC_URI = "file://pam.conf.patch \
31 file://configure-add-enable-pam.patch" 31 file://configure-add-enable-pam.patch"
32 32
33SRC_URI[md5sum] = "d05da75d9b75d93917ffb16ab48b1e19" 33SRC_URI[md5sum] = "f67a7aab557cd5b4a1311079a08acebe"
34SRC_URI[sha256sum] = "cb9af59c6a54edce9536ba629841055409d1f89d8ae26494727a97141fb4d5c1" 34SRC_URI[sha256sum] = "dbd5c8cb8edd53ef467363c3af0391c08769f1dbbd4d5002c59a4cd4cac11d52"
35 35
36EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ 36EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
37 --with-daemon_username=root \ 37 --with-daemon_username=root \