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:27 +0000 |
commit | 3ca412ed7fc5a9d525d4ba7922e7e3e179904380 (patch) | |
tree | ab4badf91587c18c31410dcbb2bf8d68c8da4487 /meta/recipes-extended/at | |
parent | 44d11b56001f40622c055069b0901cc4ae15c76c (diff) | |
download | openembedded-core-contrib-3ca412ed7fc5a9d525d4ba7922e7e3e179904380.tar.gz |
at: Upgrade 3.1.23 -> 3.2.1
This fixes flex issues with autoconf 2.70 rather than backporting patches.
Patches refreshed.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/at')
-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> parsetime.y | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 ---- a/parsetime.y -+++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 +Index: at-3.2.1/parsetime.y +=================================================================== +--- at-3.2.1.orig/parsetime.y ++++ at-3.2.1/parsetime.y +@@ -14,6 +14,9 @@ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + #endif +#define is_leap_year(y) \ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + struct tm exectm; static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number + static char *tz = NULL; +@@ -230,8 +233,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -43,7 +43,7 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number +@@ -274,8 +277,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -54,6 +54,3 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); --- -2.8.1 - 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. Date: 2010/08/31 Nitin A Kamble nitin.a.kamble@intel.com -Index: at-3.1.12/Copyright +Index: at-3.2.1/Copyright =================================================================== ---- at-3.1.12.orig/Copyright -+++ at-3.1.12/Copyright -@@ -31,10 +31,10 @@ The files posixtm.c and posixtm.h have t +--- at-3.2.1.orig/Copyright ++++ at-3.2.1/Copyright +@@ -34,10 +34,10 @@ The files posixtm.c and posixtm.h have t Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation Inc. 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> Makefile.in | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/Makefile.in b/Makefile.in -index 4c11913..18ecc23 100644 ---- a/Makefile.in -+++ b/Makefile.in +Index: at-3.2.1/Makefile.in +=================================================================== +--- at-3.2.1.orig/Makefile.in ++++ at-3.2.1/Makefile.in @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y lex.yy.c: parsetime.l $(LEX) -i parsetime.l @@ -35,6 +35,3 @@ index 4c11913..18ecc23 100644 atd.service: atd.service.in cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ --- -2.7.4 - 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> Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: at-3.1.20/Makefile.in +Index: at-3.2.1/Makefile.in =================================================================== ---- at-3.1.20.orig/Makefile.in -+++ at-3.1.20/Makefile.in -@@ -76,7 +76,9 @@ at: $(ATOBJECTS) +--- at-3.2.1.orig/Makefile.in ++++ at-3.2.1/Makefile.in +@@ -77,7 +77,9 @@ at: $(ATOBJECTS) atd: $(RUNOBJECTS) $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) 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" RCONFLICTS_${PN} = "atd" RREPLACES_${PN} = "atd" -SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ file://fix_parallel_build_error.patch \ file://posixtm.c \ file://posixtm.h \ @@ -37,8 +37,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/ PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" -SRC_URI[md5sum] = "1cec945506b5ddf1d776c92c315fc581" -SRC_URI[sha256sum] = "97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710" +SRC_URI[sha256sum] = "aabe6e5cb6dd19fe9fb25c2747492f2db38762b95ea41b86f949609c39fb55c4" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/" |