From 17148812fd02cb4f2e7845b62bb049cfad325e2a Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Wed, 21 Oct 2026 13:37:15 +1300 Subject: [PATCH] bmap-writer: upgrade 1.0.5 -> 1.0.6 Dropped patches that are part of upstream version. Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- ...p-writer_1.0.5.bb => bmap-writer_1.0.6.bb} | 4 +- ...-Honour-ImageSize-for-the-last-block.patch | 85 ------------------- ...-library-s-ioctl-request-type-for-BL.patch | 50 ----------- 3 files changed, 1 insertion(+), 138 deletions(-) rename meta-oe/recipes-support/bmap-writer/{bmap-writer_1.0.5.bb => bmap-writer_1.0.6.bb} (80%) delete mode 100644 meta-oe/recipes-support/bmap-writer/files/0001-Honour-ImageSize-for-the-last-block.patch delete mode 100644 meta-oe/recipes-support/bmap-writer/files/0001-device-Use-the-C-library-s-ioctl-request-type-for-BL.patch diff --git a/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.5.bb b/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.6.bb similarity index 80% rename from meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.5.bb rename to meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.6.bb index 3aefaa436f..a11fc7ec75 100644 --- a/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.5.bb +++ b/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.6.bb @@ -9,10 +9,8 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=e49f4652534af377a713df3d9dec60cb" SRC_URI = "git://github.com/embetrix/${BPN};branch=master;protocol=https;tag=${PV} \ - file://0001-device-Use-the-C-library-s-ioctl-request-type-for-BL.patch \ - file://0001-Honour-ImageSize-for-the-last-block.patch \ " -SRCREV = "c7b1bec0f40217d17e315226552e461a4a816abc" +SRCREV = "7662aad2fba224530c45afd511db9146dcb48ccf" DEPENDS = "libtinyxml2 libarchive" inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/bmap-writer/files/0001-Honour-ImageSize-for-the-last-block.patch b/meta-oe/recipes-support/bmap-writer/files/0001-Honour-ImageSize-for-the-last-block.patch deleted file mode 100644 index 1943256d71..0000000000 --- a/meta-oe/recipes-support/bmap-writer/files/0001-Honour-ImageSize-for-the-last-block.patch +++ /dev/null @@ -1,85 +0,0 @@ -From e63a11dedcdece8b9b285485a86405fd258b37d8 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Tue, 29 Sep 2026 17:29:52 +0200 -Subject: [PATCH] Honour ImageSize for the last block - -bmaptool records the exact image size in ImageSize, and the last block -of an image whose size is not a multiple of BlockSize is only partly -filled. Writing and verifying used (endBlock + 1) * BlockSize as the end -of every range, so the range containing that block asked for more bytes -than the image has and the write failed with "Image ended before the -block map did". Read ImageSize and clamp the end of each range to it. - -AI-Generated: Uses Claude Code (Claude Fable 5.1) -Upstream-Status: Pending ---- - src/bmap.cpp | 5 +++++ - src/bmap.h | 1 + - src/image_writer.cpp | 2 +- - src/main.cpp | 2 +- - 4 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/bmap.cpp b/src/bmap.cpp -index fabf2c2..0162ac0 100644 ---- a/src/bmap.cpp -+++ b/src/bmap.cpp -@@ -135,6 +135,7 @@ int parseBMap(const std::string &filename, bmap_t& bmapData) { - bmapData.bmapVersion = (version != nullptr) ? trimWhitespace(version) : "unknown"; - - // Parse image information -+ bmapData.imageSize = requireChildUnsigned(p_root, "ImageSize"); - bmapData.blocksTotal = requireChildUnsigned(p_root, "BlocksCount"); - bmapData.blocksMapped = requireChildUnsigned(p_root, "MappedBlocksCount"); - bmapData.blockSize = requireChildUnsigned(p_root, "BlockSize"); -@@ -200,6 +201,10 @@ int validateBmap(const bmap_t& bmap, uint64_t deviceSize) { - if (bmap.blocksTotal == 0) { - throw BmapError("BMAP: BlocksCount must not be zero"); - } -+ if (bmap.imageSize > bmap.blocksTotal * bmap.blockSize || -+ bmap.imageSize <= (bmap.blocksTotal - 1) * bmap.blockSize) { -+ throw BmapError("BMAP: ImageSize does not match BlocksCount and BlockSize"); -+ } - if (bmap.blocksMapped > bmap.blocksTotal) { - throw BmapError("BMAP: MappedBlocksCount exceeds BlocksCount"); - } -diff --git a/src/bmap.h b/src/bmap.h -index cf6ff9d..98cb969 100644 ---- a/src/bmap.h -+++ b/src/bmap.h -@@ -38,6 +38,7 @@ struct bmap_t { - std::string checksumType; - size_t blockSize = 0; - size_t blocksTotal = 0; -+ size_t imageSize = 0; - size_t blocksMapped = 0; - std::string bmapVersion; - std::string bmapChecksum; -diff --git a/src/image_writer.cpp b/src/image_writer.cpp -index bb802ea..f864151 100644 ---- a/src/image_writer.cpp -+++ b/src/image_writer.cpp -@@ -177,7 +177,7 @@ int BmapWriteImage(int fd, const bmap_t &bmap, int dev_fd, const std::string &de - for (const auto &range : bmap.ranges) { - // validateBmap() has already proven that none of this can overflow. - const size_t outStart = range.startBlock * bmap.blockSize; -- const size_t outEnd = (range.endBlock + 1) * bmap.blockSize; -+ const size_t outEnd = std::min((range.endBlock + 1) * bmap.blockSize, bmap.imageSize); - const size_t rangeSize = outEnd - outStart; - const off_t writeOffset = static_cast(outStart); - size_t writtenSize = 0; -diff --git a/src/main.cpp b/src/main.cpp -index ca42c12..b8cbbc5 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -166,7 +166,7 @@ int main(int argc, char *argv[]) { - FdGuard imageGuard(image_fd); - - std::cout << "BMAP format version: " << bmap.bmapVersion << std::endl; -- std::cout << "Image size: " << (bmap.blocksTotal * bmap.blockSize) << " bytes" << std::endl; -+ std::cout << "Image size: " << bmap.imageSize << " bytes" << std::endl; - std::cout << "Block size: " << bmap.blockSize << " bytes" << std::endl; - std::cout << "Mapped blocks: " << bmap.blocksMapped << " out of " << bmap.blocksTotal - << " (" << std::fixed << std::setprecision(1) --- -2.55.0 - diff --git a/meta-oe/recipes-support/bmap-writer/files/0001-device-Use-the-C-library-s-ioctl-request-type-for-BL.patch b/meta-oe/recipes-support/bmap-writer/files/0001-device-Use-the-C-library-s-ioctl-request-type-for-BL.patch deleted file mode 100644 index 236ff7d1ef..0000000000 --- a/meta-oe/recipes-support/bmap-writer/files/0001-device-Use-the-C-library-s-ioctl-request-type-for-BL.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7b96cb4998714bbb338adecafad8614484feb8cd Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 29 Sep 2026 12:56:53 -0700 -Subject: [PATCH] device: Use the C library's ioctl request type for - BLKGETSIZE64 - -The type of ioctl()'s request argument differs between C libraries: -glibc declares it as unsigned long, musl and bionic as int. BLKGETSIZE64 -is an unsigned long constant, so with -Wconversion -Wsign-conversion --Werror passing it directly fails on musl, while casting it to int fails -on glibc: - - device.cpp:163:50: error: unsigned conversion from 'int' to 'long unsigned int' changes value from '-2146954638' to '18446744071562596978' [-Werror=sign-conversion] - -Deduce the request type from the ioctl() declaration and convert the -request code to it explicitly, which builds on both. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/device.cpp | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/device.cpp b/src/device.cpp -index 2c06c84..d1fa995 100644 ---- a/src/device.cpp -+++ b/src/device.cpp -@@ -151,6 +151,13 @@ int openTargetDevice(const std::string& device) { - return fd; - } - -+// The type of ioctl()'s request argument depends on the C library: glibc -+// uses unsigned long, musl and bionic use int. Deduce it from the -+// declaration so request codes can be converted explicitly on all of them. -+template -+static Request ioctlRequestType(int (*)(int, Request, ...)); -+using ioctl_request_t = decltype(ioctlRequestType(&::ioctl)); -+ - // Capacity of the target in bytes, or 0 when it cannot be determined (a - // regular file which simply grows as needed). - uint64_t getDeviceSize(int fd) { -@@ -160,7 +167,7 @@ uint64_t getDeviceSize(int fd) { - if (::fstat(fd, &statbuf) != 0) { - return 0; - } -- if (S_ISBLK(statbuf.st_mode) && (::ioctl(fd, BLKGETSIZE64, &size) != 0)) { -+ if (S_ISBLK(statbuf.st_mode) && (::ioctl(fd, static_cast(BLKGETSIZE64), &size) != 0)) { - return 0; - } -