From a000ac3c832e929a441f69c6e503ad8282ed4fb7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Oct 2023 09:50:18 -0600 Subject: [PATCH] package/libubootenv: bump to version 0.3.5 Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...-fix-bug-when-SPI-flash-write-size-s.patch | 71 ------------------- package/libubootenv/libubootenv.hash | 2 +- package/libubootenv/libubootenv.mk | 2 +- 3 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch diff --git a/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch b/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch deleted file mode 100644 index 414cb3d205..0000000000 --- a/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 35bbc4d8155ed86ca7200e060dad98bdfbce684d Mon Sep 17 00:00:00 2001 -From: Stefano Babic -Date: Thu, 15 Jun 2023 16:54:46 +0200 -Subject: [PATCH] Revert "fw_setenv: fix bug when SPI flash write size != - sector size" - -This reverts commit 44ecc1c216007272a6f99a104a71c9d410969d9e. - -mtd writesize was errouneously interpreted as maximum allowed size, but -it is the minimum size. The patch raises performance issues because on -NOR flashes single bytes are written. - -Signed-off-by: Stefano Babic -Upstream: https://github.com/sbabic/libubootenv/commit/9f17a00ee56dc5cfb1d9b51e6639d67b64cb3309 -Signed-off-by: Brandon Maier ---- - src/uboot_env.c | 29 +++++++++-------------------- - 1 file changed, 9 insertions(+), 20 deletions(-) - -diff --git a/src/uboot_env.c b/src/uboot_env.c -index c5eefe7..76e2619 100644 ---- a/src/uboot_env.c -+++ b/src/uboot_env.c -@@ -712,8 +712,6 @@ static int mtdwrite(struct uboot_flash_env *dev, void *data) - sectors = dev->envsectors ? dev->envsectors : 1; - buf = data; - while (count > 0) { -- int blockcount; -- - erase.start = start; - - skip = is_nand_badblock(dev, start); -@@ -744,26 +742,17 @@ static int mtdwrite(struct uboot_flash_env *dev, void *data) - ret =-EIO; - goto devwrite_out; - } -- -- blockcount = blocksize; -- -- /* writesize can be different than the sector size. */ -- -- while (blockcount > 0) { -- if (lseek(dev->fd, start, SEEK_SET) < 0) { -- ret =-EIO; -- goto devwrite_out; -- } -- if (write(dev->fd, buf, dev->mtdinfo.writesize) != dev->mtdinfo.writesize) { -- ret =-EIO; -- goto devwrite_out; -- } -- -- blockcount -= dev->mtdinfo.writesize; -- start += dev->mtdinfo.writesize; -- buf += dev->mtdinfo.writesize; -+ if (lseek(dev->fd, start, SEEK_SET) < 0) { -+ ret =-EIO; -+ goto devwrite_out; -+ } -+ if (write(dev->fd, buf, blocksize) != blocksize) { -+ ret =-EIO; -+ goto devwrite_out; - } - MTDLOCK(dev, &erase); -+ start += dev->sectorsize; -+ buf += blocksize; - count -= blocksize; - ret += blocksize; - } --- -2.41.0 - diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash index b881994bfd..887ad6843d 100644 --- a/package/libubootenv/libubootenv.hash +++ b/package/libubootenv/libubootenv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 78faadcfac67e50273e5d4e95e6cf6fee3d486ce9dc568d1fe25312271a88768 libubootenv-0.3.4.tar.gz +sha256 dc27ddcb377e259d898256e90449bc3128437660cacc33dc75f6630d3e52c44e libubootenv-0.3.5.tar.gz sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSES/MIT.txt diff --git a/package/libubootenv/libubootenv.mk b/package/libubootenv/libubootenv.mk index b4c9588107..e5f5e9b15a 100644 --- a/package/libubootenv/libubootenv.mk +++ b/package/libubootenv/libubootenv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUBOOTENV_VERSION = 0.3.4 +LIBUBOOTENV_VERSION = 0.3.5 LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,v$(LIBUBOOTENV_VERSION)) LIBUBOOTENV_LICENSE = LGPL-2.1+, MIT, CC0-1.0 LIBUBOOTENV_LICENSE_FILES = LICENSES/CC0-1.0.txt \