diff options
| author |   Christophe Vu-Brugier <christophe.vu-brugier@seagate.com> | 2023-09-06 19:22:45 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-09-07 08:22:44 -0700 |
| commit | 7765d0de763f0eeb31b8d79429f8e5b8b017e2ff (patch) | |
| tree | 4eb2fdedfed9b0c5feb8ed2658b10ebabeda5f45 /meta-oe/recipes-support/sg3-utils | |
| parent | 981048a46e9d716f1c805be1823dbe358eaf959e (diff) | |
| download | meta-openembedded-7765d0de763f0eeb31b8d79429f8e5b8b017e2ff.tar.gz | |
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 <christophe.vu-brugier@seagate.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/sg3-utils')
| -rw-r--r-- | meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb (renamed from meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb) | 5 |
2 files changed, 2 insertions, 39 deletions
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 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 |