sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

blktool: update to 4-7 

This means replacing a "-6.1" Debian patch with "-7" patch.

(From OE-Core rev: 5c3682136358272a3a83300a865ff9b551b31834)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2015-08-11 18:27:17 +03:00 committed by Richard Purdie
parent 7cc816b9ff
commit 5b9f4512f6
4 changed files with 153 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch Normal file
View File

@ -0,0 +1,40 @@
From 9cb1667f9d3a9bcfc3b83466cd8d3b79f0554ff0 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 8 Jul 2015 01:37:09 +0300
Subject: [PATCH 1/3] fix typos in manpage
This patch is taken from
ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
Upstream-Status: Inappropriate [upstream is dead]
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
blktool.8 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/blktool.8 b/blktool.8
index a1f5c96..45b7724 100644
--- a/blktool.8
+++ b/blktool.8
@@ -191,7 +191,7 @@ Query or set device bus state (0 off, 1 on, 2 tristate)
Query the detected (or overridden, via -t) device class.
Typically this will result in 'ATA' or 'SCSI' for most devices.
Detection is based on device major; thus your SATA device may appear as
-'SCSI'.
+\&'SCSI'.
.TP
.B cd-speed
@@ -237,7 +237,7 @@ Omitting the on/off argument will print the current state.
.TP
.B media
-Lock in (or unlock) a removeable device.
+Lock in (or unlock) a removable device.
.TP
.B multiple-count
--
2.1.4

31
meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch Normal file
View File

@ -0,0 +1,31 @@
From ddb1071da2c78d8155aab62e9f0d46f69500200f Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 8 Jul 2015 01:42:24 +0300
Subject: [PATCH 2/3] fix string error
This patch is taken from
ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
Upstream-Status: Inappropriate [upstream is dead]
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util.c b/util.c
index 1f3a9ca..2ccf56a 100644
--- a/util.c
+++ b/util.c
@@ -28,7 +28,7 @@ void pdie(const char *msg, int perr)
if (perr)
perror(msg);
else
- fprintf(stderr, msg);
+ fprintf(stderr, "%s", msg);
if (blkdev >= 0)
close(blkdev);
exit(1);
--
2.1.4

78
meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch Normal file
View File

@ -0,0 +1,78 @@
From 68faa63aaad81f4a289e4a03173ab4cf798deb53 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 1 Nov 2014 22:24:32 +0300
Subject: [PATCH 3/3] Fix 3-d argument for BLKROSET it must be 'const int *'
Most of *SET ioctls have int type for 3-d argument, except BLKROSET.
So add bc_arg_type enum, build it into bool_comand and install arg_type
to bc_arg_int_ptr for BLKROSET only.
Debian-bug-id: 641164
Link: https://bugs.debian.org/641164
This patch is taken from
ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
Upstream-Status: Inappropriate [upstream is dead]
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
blktool.c | 11 +++++++++--
blktool.h | 7 +++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/blktool.c b/blktool.c
index fbefecd..221a195 100644
--- a/blktool.c
+++ b/blktool.c
@@ -85,7 +85,7 @@ static struct bool_command bool_cmd_tbl[] = {
{ { DEF_BOOL("pio-data"), dc_ata, DEF_HDIO(32BIT) },
"16-bit", "32-bit" },
{ { DEF_BOOL("readonly"), dc_any, IOCNAME(BLKROGET), IOCNAME(BLKROSET) },
- DEF_BOOLSTR },
+ DEF_BOOLSTR, bc_arg_int_ptr },
{ { DEF_BOOL("unmask-irq"), dc_ata, DEF_HDIO(UNMASKINTR) },
DEF_BOOLSTR },
{ { "wcache", ct_bool, handle_wcache, dc_any,
@@ -171,7 +171,14 @@ static void handle_bool(int argc, char **argv, struct command *cmd)
} else if ((argc == 4) && (cmd->write_ioctl_name != NULL)) {
do_32 = parse_bool(argc, argv, bcm);
- if (ioctl(blkdev, cmd->write_ioctl, do_32))
+
+ int ret;
+ if (bcm->arg_type == bc_arg_int_ptr) {
+ ret = ioctl(blkdev, cmd->write_ioctl, &do_32);
+ } else {
+ ret = ioctl(blkdev, cmd->write_ioctl, do_32);
+ }
+ if (ret)
pdie(cmd->write_ioctl_name, 1);
}
else {
diff --git a/blktool.h b/blktool.h
index fce4387..85add83 100644
--- a/blktool.h
+++ b/blktool.h
@@ -85,11 +85,18 @@ struct command {
const char *write_ioctl_name;
};
+enum bc_arg_type {
+ bc_arg_int,
+ bc_arg_int_ptr,
+};
+
struct bool_command {
struct command cmd;
const char *str_false;
const char *str_true;
+
+ enum bc_arg_type arg_type;
};
struct class_operations {
--
2.1.4

9
meta/recipes-extended/blktool/blktool_4-6.1.bb → meta/recipes-extended/blktool/blktool_4-7.bb
View File

@ -8,17 +8,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373"
DEPENDS = "glib-2.0"
PR = "r1"
SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz;name=tarball \
${DEBIAN_MIRROR}/main/b/blktool/blktool_4-6.1.diff.gz;apply=yes;name=patch"
file://0001-fix-typos-in-manpage.patch \
file://0002-fix-string-error.patch \
file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
"
SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764"
SRC_URI[patch.md5sum] = "cf605a683d54d1fbcb35b940076ddb0c"
SRC_URI[patch.sha256sum] = "d7923527e1a00984620ab307c9047a653d7ae2856cd20a82de8a33328f381ae3"
S = "${WORKDIR}/${BPN}-4.orig"
inherit autotools pkgconfig