package/at: bump version to 3.2.4
PATCH 1/1 package/at: bump version to 3.2.4
All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one.
---
...ake-install-for-non-root-don-t-stri.patch} | 24 +++-
...Makefile.in-replace-IROOT-by-DESTDIR.patch | 113 ------------------
...etloadavg.c-compilation-revert-to-3..patch | 39 ------
...-Makefile-fix-parallel-build-failure.patch | 41 -------
package/at/at.hash | 2 +-
package/at/at.mk | 2 +-
6 files changed, 20 insertions(+), 201 deletions(-)
rename package/at/{0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch => 0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch} (89%)
delete mode 100644 package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch
delete mode 100644 package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch
delete mode 100644 package/at/0004-Makefile-fix-parallel-build-failure.patchpackage/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch renamed from package/at/0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch +18 -6
@@ -1,4 +1,4 @@ -From 71d9a23ab6a73ec1287acc683716481090095de0 Mon Sep 17 00:00:00 2001 +From d3ebf63f0e1274eb7835983cb7d79216aa0a0137 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard <[email protected]> Date: Fri, 23 Jul 2021 16:47:56 +0200 Subject: [PATCH] Makefile.in: fix make install for non-root, don't strip
@@ -10,16 +10,28 @@ Signed-off-by: Peter Korsgaard <[email protected]> Signed-off-by: Vicente Olivert Riera <[email protected]> [Vincent: tweak the patch for the new version] Signed-off-by: Giulio Benetti <[email protected]> -[Giulio: convert patch to git format and rebase to version 3.2.2] +[Giulio: convert patch to git format and rebase to version 3.2.2 and +3.2.4] --- - Makefile.in | 47 +++++++++++++++++++++++------------------------ - 1 file changed, 23 insertions(+), 24 deletions(-) + Makefile.in | 51 +++++++++++++++++++++++++++------------------------ + 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in -index a7197f2..0b35a67 100644 +index 4ae194f..e6892d9 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -99,43 +99,42 @@ atrun: atrun.in +@@ -25,6 +25,10 @@ DESTDIR = $(IROOT) + $(warning IROOT is deprecated, you should use DESTDIR instead) + endif + ++ifdef IROOT ++DESTDIR = $(DESTDIR) ++endif ++ + DAEMON_USERNAME = @DAEMON_USERNAME@ + DAEMON_GROUPNAME= @DAEMON_GROUPNAME@ + LOADAVG_MX = @LOADAVG_MX@ +@@ -102,43 +106,42 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all
package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch deleted +0 -113
113 lines not on this page · raw message
package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 4eda31cea9fb3c77fe2748a65960f24ffb42f9ff Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <[email protected]> -Date: Fri, 23 Jul 2021 16:51:17 +0200 -Subject: [PATCH] getloadavg: fix getloadavg.c compilation, revert to 3.1.10 - version - -getloadavg.c shipped with 3.1.13 doesn't compile because it references -headers not shipped. Fix it by simply reverting to the 3.1.10 version. - -Signed-off-by: Peter Korsgaard <[email protected]> -Signed-off-by: Giulio Benetti <[email protected]> -[Giulio: convert patch to git format] ---- - getloadavg.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/getloadavg.c b/getloadavg.c -index cf5869f..23d18eb 100644 ---- a/getloadavg.c -+++ b/getloadavg.c -@@ -66,11 +66,12 @@ Boston, MA 02110-1301 USA */ - - /* This should always be first. */ - #ifdef HAVE_CONFIG_H --#include <config.h> -+#include "config.h" - #endif - --#include "lisp.h" --#include "sysfile.h" /* for encapsulated open, close, read, write */ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> - - #ifndef HAVE_GETLOADAVG - --- -2.25.1 -
package/at/0004-Makefile-fix-parallel-build-failure.patch deleted +0 -41
41 lines not on this page · raw message
package/at/at.hash +1 -1
@@ -1,5 +1,5 @@ # Locally calculated -sha256 2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088 at_3.2.2.orig.tar.gz +sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING
package/at/at.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.2 +AT_VERSION = 3.2.4 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_AUTORECONF = YES
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Giulio" == Giulio Benetti <[email protected]> writes:
All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one.
Signed-off-by Giulio Benetti <[email protected]>
Quoted 9 lines
+++ b/Makefile.in
-@@ -99,43 +99,42 @@ atrun: atrun.in
+@@ -25,6 +25,10 @@ DESTDIR = $(IROOT)
+ $(warning IROOT is deprecated, you should use DESTDIR instead)
+ endif
+
++ifdef IROOT
++DESTDIR = $(DESTDIR)
++endif
What does this do?
package/at/at.mk line 10
Quoted 10 lines
+++
b/package/at/at.mkpackage/at/at.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.2 +AT_VERSION = 3.2.4 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_AUTORECONF = YES
Is autoreconf still needed?
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Peter,
Quoted 16 lines · Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Giulio" == Giulio Benetti <[email protected]> writes:
All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one.
Signed-off-by Giulio Benetti <[email protected]>Quoted 9 lines
+++ b/Makefile.in
-@@ -99,43 +99,42 @@ atrun: atrun.in
+@@ -25,6 +25,10 @@ DESTDIR = $(IROOT)
+ $(warning IROOT is deprecated, you should use DESTDIR instead)
+ endif
+
++ifdef IROOT
++DESTDIR = $(DESTDIR)
++endif
Quoted 1 line
What does this do?
oops, that remained as part of the old patch so I need to drop it
Quoted 5 lines
Quoted 4 lines
+++
b/package/at/at.mkpackage/at/at.mk +0
-0@@ -4,7 +4,7 @@ # ################################################################################
Quoted 8 lines
package/at/at.mk line 10
Quoted 5 lines
package/at/at.mk +1
-1-AT_VERSION = 3.2.2 +AT_VERSION = 3.2.4 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_AUTORECONF = YESIs autoreconf still needed?
I'm checking right now
Signature · 6 lines
Giulio Benetti Benetti Engineering sas _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/1 package/at: bump version to 3.2.4
All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one.
---V1->V2: suggested by Peter
* removed useless lines from local patch
* remove AT_AUTORECONF = y since it's not needed anymore
---
...ake-install-for-non-root-don-t-stri.patch} | 9 +-
...Makefile.in-replace-IROOT-by-DESTDIR.patch | 113 ------------------
...etloadavg.c-compilation-revert-to-3..patch | 39 ------
...-Makefile-fix-parallel-build-failure.patch | 41 -------
package/at/at.hash | 2 +-
package/at/at.mk | 3 +-
6 files changed, 7 insertions(+), 200 deletions(-)
rename package/at/{0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch => 0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch} (96%)
delete mode 100644 package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch
delete mode 100644 package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch
delete mode 100644 package/at/0004-Makefile-fix-parallel-build-failure.patchpackage/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch renamed from package/at/0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch +5 -4
@@ -1,4 +1,4 @@ -From 71d9a23ab6a73ec1287acc683716481090095de0 Mon Sep 17 00:00:00 2001 +From 77b28c32ebfed0eb130a0acdb2acb7206f2b9530 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard <[email protected]> Date: Fri, 23 Jul 2021 16:47:56 +0200 Subject: [PATCH] Makefile.in: fix make install for non-root, don't strip
@@ -10,16 +10,17 @@ Signed-off-by: Peter Korsgaard <[email protected]> Signed-off-by: Vicente Olivert Riera <[email protected]> [Vincent: tweak the patch for the new version] Signed-off-by: Giulio Benetti <[email protected]> -[Giulio: convert patch to git format and rebase to version 3.2.2] +[Giulio: convert patch to git format and rebase to version 3.2.2 and +3.2.4] --- Makefile.in | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in -index a7197f2..0b35a67 100644 +index 4ae194f..af82e4c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -99,43 +99,42 @@ atrun: atrun.in +@@ -102,43 +102,42 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all
package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch deleted +0 -113
113 lines not on this page · raw message
package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 4eda31cea9fb3c77fe2748a65960f24ffb42f9ff Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <[email protected]> -Date: Fri, 23 Jul 2021 16:51:17 +0200 -Subject: [PATCH] getloadavg: fix getloadavg.c compilation, revert to 3.1.10 - version - -getloadavg.c shipped with 3.1.13 doesn't compile because it references -headers not shipped. Fix it by simply reverting to the 3.1.10 version. - -Signed-off-by: Peter Korsgaard <[email protected]> -Signed-off-by: Giulio Benetti <[email protected]> -[Giulio: convert patch to git format] ---- - getloadavg.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/getloadavg.c b/getloadavg.c -index cf5869f..23d18eb 100644 ---- a/getloadavg.c -+++ b/getloadavg.c -@@ -66,11 +66,12 @@ Boston, MA 02110-1301 USA */ - - /* This should always be first. */ - #ifdef HAVE_CONFIG_H --#include <config.h> -+#include "config.h" - #endif - --#include "lisp.h" --#include "sysfile.h" /* for encapsulated open, close, read, write */ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> - - #ifndef HAVE_GETLOADAVG - --- -2.25.1 -
package/at/0004-Makefile-fix-parallel-build-failure.patch deleted +0 -41
41 lines not on this page · raw message
package/at/at.hash +1 -1
@@ -1,5 +1,5 @@ # Locally calculated -sha256 2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088 at_3.2.2.orig.tar.gz +sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING
package/at/at.mk +1 -2
@@ -4,10 +4,9 @@ # ################################################################################ -AT_VERSION = 3.2.2 +AT_VERSION = 3.2.4 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at -AT_AUTORECONF = YES AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC AT_LICENSE_FILES = Copyright COPYING
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Giulio" == Giulio Benetti <[email protected]> writes:
All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one.
Signed-off-by Giulio Benetti <[email protected]>---
V1-> V2: suggested by Peter
* removed useless lines from local patch
* removeAT_AUTORECONF= y since it's not needed anymore
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot