From 7765d0de763f0eeb31b8d79429f8e5b8b017e2ff Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 6 Sep 2023 19:22:45 +0200 Subject: sg3-utils: upgrade 1.47 -> 1.48 Drop patch 0001-sg_dd.c-Use-off_t-instead-of-uint.patch: it was merged upstream. Signed-off-by: Christophe Vu-Brugier Signed-off-by: Khem Raj --- .../0001-sg_dd.c-Use-off_t-instead-of-uint.patch | 36 ---------------------- .../recipes-support/sg3-utils/sg3-utils_1.47.bb | 23 -------------- .../recipes-support/sg3-utils/sg3-utils_1.48.bb | 22 +++++++++++++ 3 files changed, 22 insertions(+), 59 deletions(-) delete mode 100644 meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch delete mode 100644 meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb create mode 100644 meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb (limited to 'meta-oe/recipes-support/sg3-utils') 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 -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 ---- - 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.47.bb deleted file mode 100644 index 1aa65e6cc4..0000000000 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Utilities for working with generic SCSI devices" - -DESCRIPTION = "This package contains low level utilities for devices that use the SCSI command set" - -HOMEPAGE = "http://sg.danny.cz/sg/sg3_utils.html" -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" -MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" - -UPSTREAM_CHECK_REGEX = "sg3_utils-(?P\d+(\.\d+)+)\.tgz" - -SRC_URI[sha256sum] = "8673c7faca849b6b34764332d2aa91f72db05bff7382bb836d0688795199c3e1" - -inherit autotools-brokensep - -S = "${WORKDIR}/sg3_utils-${PV}" - -RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb new file mode 100644 index 0000000000..6c3d813983 --- /dev/null +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb @@ -0,0 +1,22 @@ +SUMMARY = "Utilities for working with generic SCSI devices" + +DESCRIPTION = "This package contains low level utilities for devices that use the SCSI command set" + +HOMEPAGE = "http://sg.danny.cz/sg/sg3_utils.html" +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" +MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" + +UPSTREAM_CHECK_REGEX = "sg3_utils-(?P\d+(\.\d+)+)\.tgz" + +SRC_URI[sha256sum] = "d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c283d773" + +inherit autotools-brokensep + +S = "${WORKDIR}/sg3_utils-${PV}" + +RDEPENDS:${PN} += "bash" -- cgit 1.2.3-korg