diff options
author | Enrico Jorns <ejo@pengutronix.de> | 2018-12-17 08:52:59 +0100 |
---|---|---|
committer | Enrico Jorns <e.joerns@tu-bs.de> | 2018-12-19 00:39:28 +0100 |
commit | adf61034fd2d96911ca44bc622c131a2844aeaab (patch) | |
tree | 1104c1ee80b1b4841f70efc7236bf5b102e906cd | |
parent | 290663454c23b6875e6cbcfc4a8f499cef5399b1 (diff) | |
download | meta-ptx-adf61034fd2d96911ca44bc622c131a2844aeaab.tar.gz meta-ptx-adf61034fd2d96911ca44bc622c131a2844aeaab.tar.xz |
dt-utils: update to 2018.05.1
This version does include the glibc compilation fix patch which can
safely be removed again.
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
3 files changed, 4 insertions, 79 deletions
diff --git a/recipes-core/dt-utils/dt-utils/src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch b/recipes-core/dt-utils/dt-utils/src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch deleted file mode 100644 index 61be231..0000000 --- a/recipes-core/dt-utils/dt-utils/src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1c80e31872aec9f2ef7eca6a52aa89c0ea759d8f Mon Sep 17 00:00:00 2001 -From: Enrico Joerns <ejo@pengutronix.de> -Date: Wed, 5 Sep 2018 12:28:28 +0200 -Subject: [PATCH] src: fix compilation for glibc version 2.27.9000-36.fc29 and - newer - -As recent glibc versions (>= 2.27.9000-36.fc29) also define 'struct -statx' which is also defined in linux/stat.h, compilation fails with -error: - -| In file included from ../dt-utils-2018.05.0/src/crypto/digest.c:24: -| [..]/usr/include/linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp' -| struct statx_timestamp { -| ^~~~~~~~~~~~~~~ -| In file included from [..]/usr/include/sys/stat.h:446, -| from ../dt-utils-2018.05.0/src/dt/common.h:15, -| from ../dt-utils-2018.05.0/src/crypto/digest.c:19: -| [..]/usr/include/bits/statx.h:25:8: note: originally defined here -| struct statx_timestamp -| ^~~~~~~~~~~~~~~ -| In file included from ../dt-utils-2018.05.0/src/crypto/digest.c:24: -| [..]/usr/include/linux/stat.h:99:8: error: redefinition of 'struct statx' -| struct statx { -| ^~~~~ -| In file included from [..]/usr/include/sys/stat.h:446, -| from ../dt-utils-2018.05.0/src/dt/common.h:15, -| from ../dt-utils-2018.05.0/src/crypto/digest.c:19: -| [..]/usr/include/bits/statx.h:36:8: note: originally defined here -| struct statx -| ^~~~~ - -The linux/stat.h originates from the code that was copied from barebox -but is not explicitly required to be linux/stat.h instead of sys/stat.h -and we do not actually use struct statx. - -Thus it is safe to simply replace occurrences of linux/stat.h by -sys/stat.h to fix compilation. - -Signed-off-by: Enrico Joerns <ejo@pengutronix.de> ---- - src/barebox-state/backend_storage.c | 2 +- - src/crypto/digest.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/barebox-state/backend_storage.c b/src/barebox-state/backend_storage.c -index 53fe829..1052656 100644 ---- a/src/barebox-state/backend_storage.c -+++ b/src/barebox-state/backend_storage.c -@@ -19,7 +19,7 @@ - #include <linux/kernel.h> - #include <linux/list.h> - #include <linux/mtd/mtd-abi.h> --#include <linux/stat.h> -+#include <sys/stat.h> - #include <linux/fs.h> - #include <malloc.h> - #include <printk.h> -diff --git a/src/crypto/digest.c b/src/crypto/digest.c -index 7a8c3c0..8353412 100644 ---- a/src/crypto/digest.c -+++ b/src/crypto/digest.c -@@ -21,7 +21,7 @@ - #include <malloc.h> - #include <fs.h> - #include <fcntl.h> --#include <linux/stat.h> -+#include <sys/stat.h> - #include <errno.h> - #include <module.h> - #include <linux/err.h> --- -2.11.0 - diff --git a/recipes-core/dt-utils/dt-utils_2018.05.0.bb b/recipes-core/dt-utils/dt-utils_2018.05.0.bb deleted file mode 100644 index e7ce771..0000000 --- a/recipes-core/dt-utils/dt-utils_2018.05.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dt-utils.inc - -SRC_URI[md5sum] = "3ab2d646639bb10607716a5b57e2ddf8" -SRC_URI[sha256sum] = "fbb3393a76a63a0769135719ae3865e885efbbf4a44ba1d5ec7ebbadbcb3327a" - -SRC_URI += "file://src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch" diff --git a/recipes-core/dt-utils/dt-utils_2018.05.1.bb b/recipes-core/dt-utils/dt-utils_2018.05.1.bb new file mode 100644 index 0000000..087c209 --- /dev/null +++ b/recipes-core/dt-utils/dt-utils_2018.05.1.bb @@ -0,0 +1,4 @@ +require dt-utils.inc + +SRC_URI[md5sum] = "89d183f21fa76d4048a92bf638672442" +SRC_URI[sha256sum] = "72415ebab43e76e625b24ffcf6477e0fd62f0e4c1f838c3bad48ee8b3b49fc8c" |