From 7562931f93e0c903cf53ac87572aada13229a69d Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 3 Sep 2020 10:02:46 +0200 Subject: libubootenv: drop bbappend This has been applied to the openembedded-core layer's master and dunfell branch. Signed-off-by: Max Krummenacher --- ...-Dont-store-to-device-if-no-value-changes.patch | 68 ---------------------- ...se-canonicalized-pathname-when-reading-de.patch | 60 ------------------- recipes-bsp/u-boot/libubootenv_%.bbappend | 8 --- 3 files changed, 136 deletions(-) delete mode 100644 recipes-bsp/u-boot/libubootenv/0001-Dont-store-to-device-if-no-value-changes.patch delete mode 100644 recipes-bsp/u-boot/libubootenv/0001-uboot_env-Use-canonicalized-pathname-when-reading-de.patch delete mode 100644 recipes-bsp/u-boot/libubootenv_%.bbappend (limited to 'recipes-bsp') diff --git a/recipes-bsp/u-boot/libubootenv/0001-Dont-store-to-device-if-no-value-changes.patch b/recipes-bsp/u-boot/libubootenv/0001-Dont-store-to-device-if-no-value-changes.patch deleted file mode 100644 index d6294e1..0000000 --- a/recipes-bsp/u-boot/libubootenv/0001-Dont-store-to-device-if-no-value-changes.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ad5444c5498cb8e12c874488be45a29369fc6532 Mon Sep 17 00:00:00 2001 -From: Ming Liu -Date: Thu, 30 Jul 2020 14:16:24 +0200 -Subject: [PATCH] Dont store to device if no value changes - -Upstream-Status: Submitted - -When fw_setenv is called, it could happen that the new value is same -with the old one, in which case, we should avoid storing data to -device. - -Reference: -http://patchwork.ozlabs.org/project/swupdate/patch/20200804202120.31374-1-liu.ming50@gmail.com/ - -Signed-off-by: Ming Liu ---- - src/fw_printenv.c | 31 ++++++++++++++++++++++--------- - 1 file changed, 22 insertions(+), 9 deletions(-) - -diff --git a/src/fw_printenv.c b/src/fw_printenv.c -index 18887f9..8b830d5 100644 ---- a/src/fw_printenv.c -+++ b/src/fw_printenv.c -@@ -151,19 +151,32 @@ int main (int argc, char **argv) { - } - } - } else { /* setenv branch */ -- if (scriptfile) -+ bool need_store = false; -+ if (scriptfile) { - libuboot_load_file(ctx, scriptfile); -- else { -+ need_store = true; -+ } else { - for (i = 0; i < argc; i += 2) { -- if (i + 1 == argc) -- libuboot_set_env(ctx, argv[i], NULL); -- else -- libuboot_set_env(ctx, argv[i], argv[i+1]); -+ value = libuboot_get_env(ctx, argv[i]); -+ if (i + 1 == argc) { -+ if (value != NULL) { -+ libuboot_set_env(ctx, argv[i], NULL); -+ need_store = true; -+ } -+ } else { -+ if (value == NULL || strcmp(value, argv[i+1]) != 0) { -+ libuboot_set_env(ctx, argv[i], argv[i+1]); -+ need_store = true; -+ } -+ } - } - } -- ret = libuboot_env_store(ctx); -- if (ret) -- fprintf(stderr, "Error storing the env\n"); -+ -+ if (need_store) { -+ ret = libuboot_env_store(ctx); -+ if (ret) -+ fprintf(stderr, "Error storing the env\n"); -+ } - } - - libuboot_close(ctx); --- -2.28.0 - diff --git a/recipes-bsp/u-boot/libubootenv/0001-uboot_env-Use-canonicalized-pathname-when-reading-de.patch b/recipes-bsp/u-boot/libubootenv/0001-uboot_env-Use-canonicalized-pathname-when-reading-de.patch deleted file mode 100644 index ed08cc3..0000000 --- a/recipes-bsp/u-boot/libubootenv/0001-uboot_env-Use-canonicalized-pathname-when-reading-de.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 7f8564ad2702a95b496ffaae86afe33ee987af29 Mon Sep 17 00:00:00 2001 -From: Ming Liu -Date: Sat, 30 May 2020 20:56:42 +0200 -Subject: [PATCH] uboot_env: Use canonicalized pathname when reading device - -Upstream-Status: Submitted - -Some platform uses softlinks to the devices that hold environment -data. The mechanism used to read device type from config is not robust -in this case. Calculating the canonicalized absolute pathname of the -device could fix the problem. - -Reference: -https://patchwork.ozlabs.org/project/swupdate/patch/20200729193959.23115-1-liu.ming50@gmail.com/ - -Signed-off-by: Mathias Thore -Signed-off-by: Ming Liu ---- - src/uboot_env.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/uboot_env.c b/src/uboot_env.c -index f9ffeda..934f1bf 100644 ---- a/src/uboot_env.c -+++ b/src/uboot_env.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1103,6 +1104,7 @@ int libuboot_read_config(struct uboot_ctx *ctx, const char *config) - int ndev = 0; - struct uboot_flash_env *dev; - char *tmp; -+ char *path; - int retval = 0; - - if (!config) -@@ -1145,8 +1147,14 @@ int libuboot_read_config(struct uboot_ctx *ctx, const char *config) - ctx->size = dev->envsize; - - if (tmp) { -- strncpy(dev->devname, tmp, sizeof(dev->devname)); -+ if ((path = realpath(tmp, NULL)) == NULL) { -+ free(tmp); -+ retval = -EINVAL; -+ break; -+ } -+ strncpy(dev->devname, path, sizeof(dev->devname)); - free(tmp); -+ free(path); - } - - if (check_env_device(ctx, dev) < 0) { --- -2.28.0 - diff --git a/recipes-bsp/u-boot/libubootenv_%.bbappend b/recipes-bsp/u-boot/libubootenv_%.bbappend deleted file mode 100644 index 1237040..0000000 --- a/recipes-bsp/u-boot/libubootenv_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI_append = " \ - file://0001-Dont-store-to-device-if-no-value-changes.patch \ - file://0001-uboot_env-Use-canonicalized-pathname-when-reading-de.patch \ -" - -RRECOMMENDS_${PN}-bin_class-target += "u-boot-default-env" -- cgit v1.2.3