summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/blktool
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/blktool')
-rw-r--r--meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch40
-rw-r--r--meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch31
-rw-r--r--meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch78
-rw-r--r--meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch19
-rw-r--r--meta/recipes-extended/blktool/blktool_4-7.1.bb29
5 files changed, 0 insertions, 197 deletions
diff --git a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch b/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
deleted file mode 100644
index 25a2fabe15..0000000000
--- a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 9cb1667f9d3a9bcfc3b83466cd8d3b79f0554ff0 Mon Sep 17 00:00:00 2001
2From: Azat Khuzhin <a3at.mail@gmail.com>
3Date: Wed, 8 Jul 2015 01:37:09 +0300
4Subject: [PATCH 1/3] fix typos in manpage
5
6This patch is taken from
7ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
8
9Upstream-Status: Inappropriate [upstream is dead]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12---
13 blktool.8 | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/blktool.8 b/blktool.8
17index a1f5c96..45b7724 100644
18--- a/blktool.8
19+++ b/blktool.8
20@@ -191,7 +191,7 @@ Query or set device bus state (0 off, 1 on, 2 tristate)
21 Query the detected (or overridden, via -t) device class.
22 Typically this will result in 'ATA' or 'SCSI' for most devices.
23 Detection is based on device major; thus your SATA device may appear as
24-'SCSI'.
25+\&'SCSI'.
26
27 .TP
28 .B cd-speed
29@@ -237,7 +237,7 @@ Omitting the on/off argument will print the current state.
30
31 .TP
32 .B media
33-Lock in (or unlock) a removeable device.
34+Lock in (or unlock) a removable device.
35
36 .TP
37 .B multiple-count
38--
392.1.4
40
diff --git a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch b/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
deleted file mode 100644
index 401e41e3ed..0000000000
--- a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From ddb1071da2c78d8155aab62e9f0d46f69500200f Mon Sep 17 00:00:00 2001
2From: Azat Khuzhin <a3at.mail@gmail.com>
3Date: Wed, 8 Jul 2015 01:42:24 +0300
4Subject: [PATCH 2/3] fix string error
5
6This patch is taken from
7ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
8
9Upstream-Status: Inappropriate [upstream is dead]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12---
13 util.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/util.c b/util.c
17index 1f3a9ca..2ccf56a 100644
18--- a/util.c
19+++ b/util.c
20@@ -28,7 +28,7 @@ void pdie(const char *msg, int perr)
21 if (perr)
22 perror(msg);
23 else
24- fprintf(stderr, msg);
25+ fprintf(stderr, "%s", msg);
26 if (blkdev >= 0)
27 close(blkdev);
28 exit(1);
29--
302.1.4
31
diff --git a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch b/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
deleted file mode 100644
index d1f1e797fe..0000000000
--- a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1From 68faa63aaad81f4a289e4a03173ab4cf798deb53 Mon Sep 17 00:00:00 2001
2From: Azat Khuzhin <a3at.mail@gmail.com>
3Date: Sat, 1 Nov 2014 22:24:32 +0300
4Subject: [PATCH 3/3] Fix 3-d argument for BLKROSET it must be 'const int *'
5
6Most of *SET ioctls have int type for 3-d argument, except BLKROSET.
7So add bc_arg_type enum, build it into bool_comand and install arg_type
8to bc_arg_int_ptr for BLKROSET only.
9
10Debian-bug-id: 641164
11Link: https://bugs.debian.org/641164
12
13This patch is taken from
14ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
15
16Upstream-Status: Inappropriate [upstream is dead]
17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18
19---
20 blktool.c | 11 +++++++++--
21 blktool.h | 7 +++++++
22 2 files changed, 16 insertions(+), 2 deletions(-)
23
24diff --git a/blktool.c b/blktool.c
25index fbefecd..221a195 100644
26--- a/blktool.c
27+++ b/blktool.c
28@@ -85,7 +85,7 @@ static struct bool_command bool_cmd_tbl[] = {
29 { { DEF_BOOL("pio-data"), dc_ata, DEF_HDIO(32BIT) },
30 "16-bit", "32-bit" },
31 { { DEF_BOOL("readonly"), dc_any, IOCNAME(BLKROGET), IOCNAME(BLKROSET) },
32- DEF_BOOLSTR },
33+ DEF_BOOLSTR, bc_arg_int_ptr },
34 { { DEF_BOOL("unmask-irq"), dc_ata, DEF_HDIO(UNMASKINTR) },
35 DEF_BOOLSTR },
36 { { "wcache", ct_bool, handle_wcache, dc_any,
37@@ -171,7 +171,14 @@ static void handle_bool(int argc, char **argv, struct command *cmd)
38
39 } else if ((argc == 4) && (cmd->write_ioctl_name != NULL)) {
40 do_32 = parse_bool(argc, argv, bcm);
41- if (ioctl(blkdev, cmd->write_ioctl, do_32))
42+
43+ int ret;
44+ if (bcm->arg_type == bc_arg_int_ptr) {
45+ ret = ioctl(blkdev, cmd->write_ioctl, &do_32);
46+ } else {
47+ ret = ioctl(blkdev, cmd->write_ioctl, do_32);
48+ }
49+ if (ret)
50 pdie(cmd->write_ioctl_name, 1);
51 }
52 else {
53diff --git a/blktool.h b/blktool.h
54index fce4387..85add83 100644
55--- a/blktool.h
56+++ b/blktool.h
57@@ -85,11 +85,18 @@ struct command {
58 const char *write_ioctl_name;
59 };
60
61+enum bc_arg_type {
62+ bc_arg_int,
63+ bc_arg_int_ptr,
64+};
65+
66 struct bool_command {
67 struct command cmd;
68
69 const char *str_false;
70 const char *str_true;
71+
72+ enum bc_arg_type arg_type;
73 };
74
75 struct class_operations {
76--
772.1.4
78
diff --git a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
deleted file mode 100644
index 65bca65100..0000000000
--- a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Description: Fix FTBFS with glibc 2.28
2Author: Adrian Bunk <bunk@debian.org>
3Bug-Debian: https://bugs.debian.org/917055
4
5This patch is taken from
6http://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.1.debian.tar.xz
7
8Upstream-Status: Inappropriate [upstream is dead]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10--- blktool-4.orig/blktool.c
11+++ blktool-4/blktool.c
12@@ -18,6 +18,7 @@
13 #include <unistd.h>
14 #include <sys/stat.h>
15 #include <sys/ioctl.h>
16+#include <sys/sysmacros.h>
17 #include <fcntl.h>
18 #include <errno.h>
19 #include <getopt.h>
diff --git a/meta/recipes-extended/blktool/blktool_4-7.1.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb
deleted file mode 100644
index bb44befb56..0000000000
--- a/meta/recipes-extended/blktool/blktool_4-7.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1SUMMARY = "Tune low-level block device parameters"
2DESCRIPTION = "blktool is used for querying and/or changing settings \
3of a block device. It is like hdparm but a more general tool, as it \
4works on SCSI, IDE and SATA devices."
5HOMEPAGE = "http://packages.debian.org/unstable/admin/blktool"
6LICENSE = "GPL-2.0-or-later"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373"
9
10DEPENDS = "glib-2.0"
11
12SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/b/${BPN}/${BPN}_4.orig.tar.gz;name=tarball \
13 file://0001-fix-typos-in-manpage.patch \
14 file://0002-fix-string-error.patch \
15 file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
16 file://0004-fix-ftbfs-glibc-2.28.patch \
17 "
18
19SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
20SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764"
21
22# for this package we're mostly interested in tracking debian patches,
23# and not in the upstream version where all development has effectively stopped
24UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/blktool/"
25UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
26
27S = "${WORKDIR}/${BPN}-4.orig"
28
29inherit autotools pkgconfig
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 22:27:34 +0000