+++ /dev/null
-From ffca94e6f84956838a2d88824b37fcd3b0d0694b Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Sun, 5 May 2019 21:42:48 +0200
-Subject: [PATCH] fw_printenv: remove declaration in for loop
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This commit fixes :
-
-src/fw_printenv.c:142:4: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode
- for (int i = 0; i < argc; i++) {
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
-[Upstream status: https://github.com/sbabic/libubootenv/commit/d63007652f1d9f9256a5eedbce6273b9848b653c]
----
- src/fw_printenv.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/fw_printenv.c b/src/fw_printenv.c
-index 361d150..4236eaa 100644
---- a/src/fw_printenv.c
-+++ b/src/fw_printenv.c
-@@ -59,7 +59,7 @@ int main (int argc, char **argv) {
- char *cfgfname = NULL;
- char *defenvfile = NULL;
- char *scriptfile = NULL;
-- int c;
-+ int c, i;
- int ret = 0;
- void *tmp;
- const char *name, *value;
-@@ -139,7 +139,7 @@ int main (int argc, char **argv) {
- fprintf(stdout, "%s=%s\n", name, value);
- }
- } else {
-- for (int i = 0; i < argc; i++) {
-+ for (i = 0; i < argc; i++) {
- value = libuboot_get_env(ctx, argv[i]);
- if (noheader)
- fprintf(stdout, "%s\n", value ? value : "");
-@@ -151,7 +151,7 @@ int main (int argc, char **argv) {
- if (scriptfile)
- libuboot_load_file(ctx, scriptfile);
- else {
-- for (int i = 0; i < argc; i += 2) {
-+ for (i = 0; i < argc; i += 2) {
- if (i + 1 == argc)
- libuboot_set_env(ctx, argv[i], NULL);
- else
---
-2.7.4
-
--- /dev/null
+From 5448ca9d92f7fa197060323a82a5f060ce7c31e7 Mon Sep 17 00:00:00 2001
+From: Pierre-Jean Texier <pjtexier@koncepto.io>
+Date: Wed, 22 May 2019 10:26:27 +0200
+Subject: [PATCH] src/CMakeLists.txt: do not force the build of a shared
+ library
+
+By definition, projects using CMake which can build either static or shared
+libraries use a BUILD_SHARED_LIBS flag to allow selecting between both.
+So, let CMake rely on the standard BUILD_SHARED_LIBS variable to decide
+whether a static or shared library should be built.
+
+however, we can control the behaviour as follows:
+
+ $. cmake -DBUILD_SHARED_LIBS=OFF ...
+
+ $. cmake -DBUILS_SHARED_LIBS=ON ...
+
+With Yocto/OE, just add the following option into the libubootenv recipe :
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON"
+
+Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
+[Upstream status: http://patchwork.ozlabs.org/patch/1103437/]
+---
+ src/CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 051732b..c5f6dcb 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -10,10 +10,9 @@ SET(include_HEADERS
+ libuboot.h
+ )
+
+-add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS})
++add_library(ubootenv ${libubootenv_SOURCES} ${include_HEADERS})
+ SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION})
+
+-ADD_LIBRARY(ubootenv_static STATIC ${libubootenv_SOURCES} ${include_HEADERS})
+ add_executable(fw_printenv fw_printenv.c)
+ add_executable(fw_setenv fw_setenv.c)
+ target_link_libraries(fw_printenv ubootenv z)
+--
+2.7.4
+
+++ /dev/null
-From 5448ca9d92f7fa197060323a82a5f060ce7c31e7 Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Wed, 22 May 2019 10:26:27 +0200
-Subject: [PATCH] src/CMakeLists.txt: do not force the build of a shared
- library
-
-By definition, projects using CMake which can build either static or shared
-libraries use a BUILD_SHARED_LIBS flag to allow selecting between both.
-So, let CMake rely on the standard BUILD_SHARED_LIBS variable to decide
-whether a static or shared library should be built.
-
-however, we can control the behaviour as follows:
-
- $. cmake -DBUILD_SHARED_LIBS=OFF ...
-
- $. cmake -DBUILS_SHARED_LIBS=ON ...
-
-With Yocto/OE, just add the following option into the libubootenv recipe :
-
-EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON"
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
-[Upstream status: http://patchwork.ozlabs.org/patch/1103437/]
----
- src/CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 051732b..c5f6dcb 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,10 +10,9 @@ SET(include_HEADERS
- libuboot.h
- )
-
--add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS})
-+add_library(ubootenv ${libubootenv_SOURCES} ${include_HEADERS})
- SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION})
-
--ADD_LIBRARY(ubootenv_static STATIC ${libubootenv_SOURCES} ${include_HEADERS})
- add_executable(fw_printenv fw_printenv.c)
- add_executable(fw_setenv fw_setenv.c)
- target_link_libraries(fw_printenv ubootenv z)
---
-2.7.4
-
+++ /dev/null
-From 113a4ea9ec48b9428b3abac21ecca7d8f11502fe Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Tue, 21 May 2019 21:32:27 +0200
-Subject: [libubootenv][PATCH] uboot_env: fix build with musl libc
-
-Fixes the following compile failure when building with musl:
-
- - http://autobuild.buildroot.net/results/206/206f1eba0dec39de1c02d760fa8f961d5a3879d0/
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
-[Upstream status: http://patchwork.ozlabs.org/patch/1103009/]
----
- src/uboot_env.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/uboot_env.c b/src/uboot_env.c
-index 4c298d1..a0f977c 100644
---- a/src/uboot_env.c
-+++ b/src/uboot_env.c
-@@ -11,6 +11,8 @@
- * @brief This is the implementation of libubootenv library
- *
- */
-+
-+#define _GNU_SOURCE
-
- #include <stdio.h>
- #include <stdlib.h>
---
-2.7.4
-
+++ /dev/null
-From fa991d153a73e312683b751e9f65d8df6ac61732 Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Tue, 21 May 2019 21:40:23 +0200
-Subject: [libubootenv][PATCH] uboot_env: fix compilation for glibc version
- >= 2.28
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with glibc 2.28, include file sys/stat.h will have a
-definition for struct statx, in which case include file linux/stat.h should be
-avoided, in order to prevent a duplicate definition.
-
-This commit fixes (if _GNU_SOURCE is defined):
-
-/usr/include/linux/stat.h:56:8: error: redefinition of ‘struct statx_timestamp’
- struct statx_timestamp {
- ^~~~~~~~~~~~~~~
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
-[Upstream status: http://patchwork.ozlabs.org/patch/1103010/]
----
- src/uboot_env.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/uboot_env.c b/src/uboot_env.c
-index a0f977c..e8483bf 100644
---- a/src/uboot_env.c
-+++ b/src/uboot_env.c
-@@ -32,7 +32,6 @@
- #include <sys/wait.h>
- #include <sys/ioctl.h>
- #include <zlib.h>
--#include <linux/stat.h>
- #include <mtd/mtd-user.h>
- #include <mtd/ubi-user.h>
-
---
-2.7.4
-
+++ /dev/null
-From ac4f795f2c0a81d5b55ce825f3d4c933fbc9e44c Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Tue, 4 Jun 2019 11:43:47 +0200
-Subject: [libubootenv][PATCH] uboot_env: remove <pthread.h> header file
-
-<pthread.h> include doesn't seem to be necessary inside the library.
-So, drop the header completely.
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
-[Upstream status: http://patchwork.ozlabs.org/patch/1109822/]
----
- src/uboot_env.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/uboot_env.c b/src/uboot_env.c
-index e8483bf..3f1bb3b 100644
---- a/src/uboot_env.c
-+++ b/src/uboot_env.c
-@@ -24,7 +24,6 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <ctype.h>
--#include <pthread.h>
- #include <signal.h>
- #include <sys/file.h>
- #include <sys/types.h>
---
-2.7.4
-
# Locally calculated
-sha256 82c6966af5feae8726bd78a2cde4c4c2f69e81f8fdc548098063f8a35eaad090 libubootenv-8a7d4030bcb106de11632e85b6a0e7b7d4cb47af.tar.gz
+sha256 9c8b0e6d596b43127ccdf6b2d181dce597fb1f90211aa36c4d88b5c6a31ef026 libubootenv-3286c571c7e15be4b341e46986f1c0dc74730207.tar.gz
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt
#
################################################################################
-LIBUBOOTENV_VERSION = 8a7d4030bcb106de11632e85b6a0e7b7d4cb47af
+LIBUBOOTENV_VERSION = 3286c571c7e15be4b341e46986f1c0dc74730207
LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION))
LIBUBOOTENV_LICENSE = LGPL-2.1
+LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt
LIBUBOOTENV_INSTALL_STAGING = YES
LIBUBOOTENV_DEPENDENCIES = zlib
projects / buildroot.git / commitdiff