diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-28 22:25:24 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-29 21:21:53 +0000 |
commit | 77493aa990d9bfa99055f427abc20e120ae29bf9 (patch) | |
tree | 65cd0c1a81a7449907aaca3fc1396af55a59a269 | |
parent | e1caf4f305b2f96eb73c9eaba6a2f0bf2158d5be (diff) | |
download | poky-77493aa990d9bfa99055f427abc20e120ae29bf9.tar.gz |
at: Upgrade 3.1.23 -> 3.2.1
This fixes flex issues with autoconf 2.70 rather than backporting patches.
Patches refreshed.
(From OE-Core rev: 3ca412ed7fc5a9d525d4ba7922e7e3e179904380)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch | 23 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/file_replacement_with_gplv2.patch | 8 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/fix_parallel_build_error.patch | 11 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/makefile-fix-parallel.patch | 8 | ||||
-rw-r--r-- | meta/recipes-extended/at/at_3.2.1.bb (renamed from meta/recipes-extended/at/at_3.1.23.bb) | 5 |
5 files changed, 24 insertions, 31 deletions
diff --git a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch b/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch index 7fdecc7fd1..fd57f94cd5 100644 --- a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch +++ b/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch | |||
@@ -18,21 +18,21 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> | |||
18 | parsetime.y | 11 +++++++---- | 18 | parsetime.y | 11 +++++++---- |
19 | 1 file changed, 7 insertions(+), 4 deletions(-) | 19 | 1 file changed, 7 insertions(+), 4 deletions(-) |
20 | 20 | ||
21 | diff --git a/parsetime.y b/parsetime.y | 21 | Index: at-3.2.1/parsetime.y |
22 | index 7005e88..324e6d3 100644 | 22 | =================================================================== |
23 | --- a/parsetime.y | 23 | --- at-3.2.1.orig/parsetime.y |
24 | +++ b/parsetime.y | 24 | +++ at-3.2.1/parsetime.y |
25 | @@ -8,6 +8,9 @@ | 25 | @@ -14,6 +14,9 @@ |
26 | 26 | ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) | |
27 | #define YYDEBUG 1 | 27 | #endif |
28 | 28 | ||
29 | +#define is_leap_year(y) \ | 29 | +#define is_leap_year(y) \ |
30 | + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) | 30 | + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) |
31 | + | 31 | + |
32 | struct tm exectm; | 32 | struct tm exectm; |
33 | static int isgmt; | 33 | static int isgmt; |
34 | static int yearspec; | 34 | static char *tz = NULL; |
35 | @@ -217,8 +220,8 @@ date : month_name day_number | 35 | @@ -230,8 +233,8 @@ date : month_name day_number |
36 | mnum == 12) && dnum > 31) | 36 | mnum == 12) && dnum > 31) |
37 | || ((mnum == 4 || mnum == 6 || mnum == 9 || | 37 | || ((mnum == 4 || mnum == 6 || mnum == 9 || |
38 | mnum == 11) && dnum > 30) | 38 | mnum == 11) && dnum > 30) |
@@ -43,7 +43,7 @@ index 7005e88..324e6d3 100644 | |||
43 | ) | 43 | ) |
44 | { | 44 | { |
45 | yyerror("Error in day of month"); | 45 | yyerror("Error in day of month"); |
46 | @@ -261,8 +264,8 @@ date : month_name day_number | 46 | @@ -274,8 +277,8 @@ date : month_name day_number |
47 | mnum == 12) && dnum > 31) | 47 | mnum == 12) && dnum > 31) |
48 | || ((mnum == 4 || mnum == 6 || mnum == 9 || | 48 | || ((mnum == 4 || mnum == 6 || mnum == 9 || |
49 | mnum == 11) && dnum > 30) | 49 | mnum == 11) && dnum > 30) |
@@ -54,6 +54,3 @@ index 7005e88..324e6d3 100644 | |||
54 | ) | 54 | ) |
55 | { | 55 | { |
56 | yyerror("Error in day of month"); | 56 | yyerror("Error in day of month"); |
57 | -- | ||
58 | 2.8.1 | ||
59 | |||
diff --git a/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch b/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch index d5ef0032be..11023bdf52 100644 --- a/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch +++ b/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch | |||
@@ -10,11 +10,11 @@ update the Copyright file information to reflect the replaced files. | |||
10 | Date: 2010/08/31 | 10 | Date: 2010/08/31 |
11 | Nitin A Kamble nitin.a.kamble@intel.com | 11 | Nitin A Kamble nitin.a.kamble@intel.com |
12 | 12 | ||
13 | Index: at-3.1.12/Copyright | 13 | Index: at-3.2.1/Copyright |
14 | =================================================================== | 14 | =================================================================== |
15 | --- at-3.1.12.orig/Copyright | 15 | --- at-3.2.1.orig/Copyright |
16 | +++ at-3.1.12/Copyright | 16 | +++ at-3.2.1/Copyright |
17 | @@ -31,10 +31,10 @@ The files posixtm.c and posixtm.h have t | 17 | @@ -34,10 +34,10 @@ The files posixtm.c and posixtm.h have t |
18 | Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, | 18 | Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, |
19 | 2005, 2006, 2007 Free Software Foundation Inc. | 19 | 2005, 2006, 2007 Free Software Foundation Inc. |
20 | 20 | ||
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 30d2324126..e4f32b82b6 100644 --- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ b/meta/recipes-extended/at/at/fix_parallel_build_error.patch | |||
@@ -22,10 +22,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
22 | Makefile.in | 2 ++ | 22 | Makefile.in | 2 ++ |
23 | 1 file changed, 2 insertions(+) | 23 | 1 file changed, 2 insertions(+) |
24 | 24 | ||
25 | diff --git a/Makefile.in b/Makefile.in | 25 | Index: at-3.2.1/Makefile.in |
26 | index 4c11913..18ecc23 100644 | 26 | =================================================================== |
27 | --- a/Makefile.in | 27 | --- at-3.2.1.orig/Makefile.in |
28 | +++ b/Makefile.in | 28 | +++ at-3.2.1/Makefile.in |
29 | @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y | 29 | @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y |
30 | lex.yy.c: parsetime.l | 30 | lex.yy.c: parsetime.l |
31 | $(LEX) -i parsetime.l | 31 | $(LEX) -i parsetime.l |
@@ -35,6 +35,3 @@ index 4c11913..18ecc23 100644 | |||
35 | atd.service: atd.service.in | 35 | atd.service: atd.service.in |
36 | cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ | 36 | cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ |
37 | 37 | ||
38 | -- | ||
39 | 2.7.4 | ||
40 | |||
diff --git a/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/meta/recipes-extended/at/at/makefile-fix-parallel.patch index d6056dceff..adb8652053 100644 --- a/meta/recipes-extended/at/at/makefile-fix-parallel.patch +++ b/meta/recipes-extended/at/at/makefile-fix-parallel.patch | |||
@@ -15,11 +15,11 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
15 | Makefile | 4 +++- | 15 | Makefile | 4 +++- |
16 | 1 file changed, 3 insertions(+), 1 deletion(-) | 16 | 1 file changed, 3 insertions(+), 1 deletion(-) |
17 | 17 | ||
18 | Index: at-3.1.20/Makefile.in | 18 | Index: at-3.2.1/Makefile.in |
19 | =================================================================== | 19 | =================================================================== |
20 | --- at-3.1.20.orig/Makefile.in | 20 | --- at-3.2.1.orig/Makefile.in |
21 | +++ at-3.1.20/Makefile.in | 21 | +++ at-3.2.1/Makefile.in |
22 | @@ -76,7 +76,9 @@ at: $(ATOBJECTS) | 22 | @@ -77,7 +77,9 @@ at: $(ATOBJECTS) |
23 | atd: $(RUNOBJECTS) | 23 | atd: $(RUNOBJECTS) |
24 | $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) | 24 | $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) |
25 | 25 | ||
diff --git a/meta/recipes-extended/at/at_3.1.23.bb b/meta/recipes-extended/at/at_3.2.1.bb index b74882d342..9574b27792 100644 --- a/meta/recipes-extended/at/at_3.1.23.bb +++ b/meta/recipes-extended/at/at_3.2.1.bb | |||
@@ -22,7 +22,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" | |||
22 | RCONFLICTS_${PN} = "atd" | 22 | RCONFLICTS_${PN} = "atd" |
23 | RREPLACES_${PN} = "atd" | 23 | RREPLACES_${PN} = "atd" |
24 | 24 | ||
25 | SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \ | 25 | SRC_URI = "http://software.calhariz.com/at/${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,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/ | |||
37 | PAM_SRC_URI = "file://pam.conf.patch \ | 37 | PAM_SRC_URI = "file://pam.conf.patch \ |
38 | file://configure-add-enable-pam.patch" | 38 | file://configure-add-enable-pam.patch" |
39 | 39 | ||
40 | SRC_URI[md5sum] = "1cec945506b5ddf1d776c92c315fc581" | 40 | SRC_URI[sha256sum] = "aabe6e5cb6dd19fe9fb25c2747492f2db38762b95ea41b86f949609c39fb55c4" |
41 | SRC_URI[sha256sum] = "97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710" | ||
42 | 41 | ||
43 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/" | 42 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/" |
44 | 43 | ||