[ptxdist] [PATCH v3] squashfs-tools: Use sysmacros fixes build with glibc >= 2.28
Signed-off-by: Gavin Schenk --- changes since v2: - Fixed typo in subject, indeed its glibc not glib! ...sysmacros-fixes-build-with-glib-2.28.patch | 41 +++ patches/squashfs4.3/series| 4 ++ 2 files changed, 45 insertions(+) create mode 100644 patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch create mode 100644 patches/squashfs4.3/series diff --git a/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch new file mode 100644 index 0..66a396bac --- /dev/null +++ b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch @@ -0,0 +1,41 @@ +From: Gavin Schenk +Date: Tue, 18 Dec 2018 11:19:47 +0100 +Subject: [PATCH] Use sysmacros fixes build with glib >2.28 + +From the manpages major, minor, makedev: +The BSDs expose the definitions for these macros via . +Depending on the version, glibc also exposes definitions for these macros +from that header file if suitable feature test macros are defined. +However, this behavior was deprecated in glibc 2.25, +and since glibc 2.28, no longer provides these definitions. + +Signed-off-by: Gavin Schenk +--- + squashfs-tools/mksquashfs.c | 1 + + squashfs-tools/unsquashfs.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index 86f82bb92804..84affd4be160 100644 +--- a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +index 1323dd6f2cb9..2633e0c0b7ef 100644 +--- a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +@@ -32,6 +32,7 @@ + #include "stdarg.h" + + #include ++#include + #include + #include + #include diff --git a/patches/squashfs4.3/series b/patches/squashfs4.3/series new file mode 100644 index 0..6ea61897b --- /dev/null +++ b/patches/squashfs4.3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Use-sysmacros-fixes-build-with-glib-2.28.patch +# 86201a06abd18a6b9f0e983e9183d6ac - git-ptx-patches magic -- 2.19.2 -- Eckelmann AG Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann Vorsitzender des Aufsichtsrats: Hubertus G. Krossa Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636 http://www.eckelmann.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] kconfig: fix warnings on format
Hi, Am Mittwoch, den 12.12.2018, 14:06 + schrieb Denis OSTERLAND: > Hi, > > Am Mittwoch, den 12.12.2018, 14:29 +0100 schrieb Michael Olbrich: > > > > On Wed, Dec 12, 2018 at 10:31:27AM +, Denis OSTERLAND wrote: > > > > > > > > > Fixes warnings like: > > > conf.c:79:3: warning: format not a string literal and no format arguments > > > [-Wformat-security] > > > printf(_("aborted!\n\n")); > > > ^ > > Can you elaborate what triggers this? I don't get this warning here. > > Please add this to the commit message. > Just call make clean all. > Maybe it depends on GCC. > I tested with: > - gcc (Ubuntu 5.5.0-12ubuntu1~16.04) 5.5.0 20171010 > - gcc (Ubuntu 8.1.0-5ubuntu1~16.04) 8.1.0 I have tested with Debian Buster and Ubuntu Bionic now. On Ubuntu I get these warnings, but on Debian not. Maybe Ubuntu configures GCC other than Debian on compile time. Regards Denis Diehl Connectivity Solutions GmbH Geschäftsführung: Horst Leonberger Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht Nürnberg: HRB 32315 ___ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] squashfs-tools: Use sysmacros fixes build with glib >2.28
On Tue, Dec 18, 2018 at 12:16:11PM +0100, Gavin Schenk wrote: > Signed-off-by: Gavin Schenk > --- > > changes since v1: > > - Add include instead replacing it. > After a discussion with ukl in IRC, it turns out that it is more > compatible to add the include instead of replacing it. Additionally, > mksquashfs.c uses open that requires sys/types.h. Thank you, I was about to send the same fix :) (except there's a typo in subject as glib and glibc are different libraries) Additionally, we'll need this one: https://github.com/paulusmack/ppp/commit/3c7b86229f7bd2600d74db14b1fe5b3896be3875 and then at91bootstrap broke yet another time with OSELAS.Toolchain-2018.12.0 Unless someone is going to be faster I'll send fixes later today. But that brings a question whenever we want/need something to compare glibc versions as I do not think it is good idea to add openssl (to ppp) dependency for everyone, even those using pre-2.28 glibc. ladis ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] squashfs-tools: Use sysmacros fixes build with glib >2.28
Signed-off-by: Gavin Schenk --- changes since v1: - Add include instead replacing it. After a discussion with ukl in IRC, it turns out that it is more compatible to add the include instead of replacing it. Additionally, mksquashfs.c uses open that requires sys/types.h. ...sysmacros-fixes-build-with-glib-2.28.patch | 41 +++ patches/squashfs4.3/series| 4 ++ 2 files changed, 45 insertions(+) create mode 100644 patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch create mode 100644 patches/squashfs4.3/series diff --git a/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch new file mode 100644 index 0..66a396bac --- /dev/null +++ b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch @@ -0,0 +1,41 @@ +From: Gavin Schenk +Date: Tue, 18 Dec 2018 11:19:47 +0100 +Subject: [PATCH] Use sysmacros fixes build with glib >2.28 + +From the manpages major, minor, makedev: +The BSDs expose the definitions for these macros via . +Depending on the version, glibc also exposes definitions for these macros +from that header file if suitable feature test macros are defined. +However, this behavior was deprecated in glibc 2.25, +and since glibc 2.28, no longer provides these definitions. + +Signed-off-by: Gavin Schenk +--- + squashfs-tools/mksquashfs.c | 1 + + squashfs-tools/unsquashfs.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index 86f82bb92804..84affd4be160 100644 +--- a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +index 1323dd6f2cb9..2633e0c0b7ef 100644 +--- a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +@@ -32,6 +32,7 @@ + #include "stdarg.h" + + #include ++#include + #include + #include + #include diff --git a/patches/squashfs4.3/series b/patches/squashfs4.3/series new file mode 100644 index 0..6ea61897b --- /dev/null +++ b/patches/squashfs4.3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Use-sysmacros-fixes-build-with-glib-2.28.patch +# 86201a06abd18a6b9f0e983e9183d6ac - git-ptx-patches magic -- 2.19.2 -- Eckelmann AG Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann Vorsitzender des Aufsichtsrats: Hubertus G. Krossa Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636 http://www.eckelmann.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] squashfs-tools: Use sysmacros fixes build with glib >2.28
Signed-off-by: Gavin Schenk --- ...sysmacros-fixes-build-with-glib-2.28.patch | 43 +++ patches/squashfs4.3/series| 4 ++ 2 files changed, 47 insertions(+) create mode 100644 patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch create mode 100644 patches/squashfs4.3/series diff --git a/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch new file mode 100644 index 0..d43136581 --- /dev/null +++ b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch @@ -0,0 +1,43 @@ +From: Gavin Schenk +Date: Tue, 18 Dec 2018 11:19:47 +0100 +Subject: [PATCH] Use sysmacros fixes build with glib >2.28 + +From the manpages major, minor, makedev: +The BSDs expose the definitions for these macros via . +Depending on the version, glibc also exposes definitions for these macros +from that header file if suitable feature test macros are defined. +However, this behavior was deprecated in glibc 2.25, +and since glibc 2.28, no longer provides these definitions. + +Signed-off-by: Gavin Schenk +--- + squashfs-tools/mksquashfs.c | 2 +- + squashfs-tools/unsquashfs.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index 86f82bb92804..95528be8733c 100644 +--- a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +index 1323dd6f2cb9..cb8bb193d268 100644 +--- a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +@@ -32,7 +32,7 @@ + #include "stdarg.h" + + #include +-#include ++#include + #include + #include + #include diff --git a/patches/squashfs4.3/series b/patches/squashfs4.3/series new file mode 100644 index 0..6ea61897b --- /dev/null +++ b/patches/squashfs4.3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Use-sysmacros-fixes-build-with-glib-2.28.patch +# 86201a06abd18a6b9f0e983e9183d6ac - git-ptx-patches magic -- 2.19.2 -- Eckelmann AG Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann Vorsitzender des Aufsichtsrats: Hubertus G. Krossa Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636 http://www.eckelmann.de ___ ptxdist mailing list ptxdist@pengutronix.de