diff mbox series

[meta-oe] sg3-utils: upgrade 1.47 -> 1.48

Message ID 20230906172245.41023-1-cvubrugier@fastmail.fm
State Under Review
Headers show
Series [meta-oe] sg3-utils: upgrade 1.47 -> 1.48 | expand

Commit Message

Christophe Vu-Brugier Sept. 6, 2023, 5:22 p.m. UTC 
From: Christophe Vu-Brugier <christophe.vu-brugier@seagate.com>

Drop patch 0001-sg_dd.c-Use-off_t-instead-of-uint.patch: it was
merged upstream.

Signed-off-by: Christophe Vu-Brugier <christophe.vu-brugier@seagate.com>
---
 ...01-sg_dd.c-Use-off_t-instead-of-uint.patch | 36 -------------------
 .../{sg3-utils_1.47.bb => sg3-utils_1.48.bb}  |  5 ++-
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch
 rename meta-oe/recipes-support/sg3-utils/{sg3-utils_1.47.bb => sg3-utils_1.48.bb} (73%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch b/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch
deleted file mode 100644
index 317876f197..0000000000
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From 9a8ede03ef61cdf527ce3a80771150a7452e4603 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 11 Mar 2023 22:56:17 -0800
-Subject: [PATCH] sg_dd.c: Use off_t instead of uint
-
-uint is not available on every platform e.g. linux/musl systems. Use
-uint32_t instead to represent 'off' variable, Fixes
-
-sg_dd.c:2402:17: error: use of undeclared identifier 'uint'; did you mean 'int'?
-                uint off;
-                ^~~~
-                int
-1 error generated.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/sg_dd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sg_dd.c b/src/sg_dd.c
-index 9d05c93..35e2423 100644
---- a/src/sg_dd.c
-+++ b/src/sg_dd.c
-@@ -2399,7 +2399,7 @@ main(int argc, char * argv[])
-             res = blocks * blk_sz;
-             if (iflag.zero && iflag.ff && (blk_sz >= 4)) {
-                 uint32_t pos = (uint32_t)skip;
--                uint off;
-+                uint32_t off;
- 
-                 for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) {
-                     for (j = 0; j < (blk_sz - 3); j += 4)
--- 
-2.39.2
-
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
similarity index 73%
rename from meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb
rename to meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
index 1aa65e6cc4..6c3d813983 100644
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb
+++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
@@ -8,13 +8,12 @@  SECTION = "console/admin"
 LICENSE = "GPL-2.0-or-later & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f685699d3ac82f108aa880043fa3feb7"
 
-SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \
-           file://0001-sg_dd.c-Use-off_t-instead-of-uint.patch"
+SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz"
 MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc"
 
 UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz"
 
-SRC_URI[sha256sum] = "8673c7faca849b6b34764332d2aa91f72db05bff7382bb836d0688795199c3e1"
+SRC_URI[sha256sum] = "d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c283d773"
 
 inherit autotools-brokensep