mirror of
https://git.yoctoproject.org/poky
synced 2026-03-19 05:39:39 +01:00
blktool: remove the recipe
It was created in 2004 as an alternative to hdparm and never updated since (while hdparm remains in active development). (From OE-Core rev: 54c1243a259a2f6407c0202d03414fc5272b2d90) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
8dc89e2d3d
commit
e8db9d1eae
@@ -17,7 +17,6 @@ DISTRO_PN_ALIAS:pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover"
|
||||
DISTRO_PN_ALIAS:pn-babeltrace = "OSPDT"
|
||||
DISTRO_PN_ALIAS:pn-babeltrace2 = "OSPDT"
|
||||
DISTRO_PN_ALIAS:pn-bjam = "OpenSuSE=boost-jam Debian=bjam"
|
||||
DISTRO_PN_ALIAS:pn-blktool = "Debian=blktool Mandriva=blktool"
|
||||
DISTRO_PN_ALIAS:pn-bluez5 = "Fedora=bluez Opensuse=bluez"
|
||||
DISTRO_PN_ALIAS:pn-bootchart2 = "Fedora=bootchart2 Opensuse=bootchart"
|
||||
DISTRO_PN_ALIAS:pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
|
||||
|
||||
@@ -69,7 +69,6 @@ RECIPE_MAINTAINER:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem R
|
||||
RECIPE_MAINTAINER:pn-binutils-testsuite = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-binutils-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-bison = "Chen Qi <Qi.Chen@windriver.com>"
|
||||
RECIPE_MAINTAINER:pn-blktool = "Yi Zhao <yi.zhao@windriver.com>"
|
||||
RECIPE_MAINTAINER:pn-blktrace = "Unassigned <unassigned@yoctoproject.org>"
|
||||
RECIPE_MAINTAINER:pn-bluez5 = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER:pn-bmaptool = "Trevor Woerner <twoerner@gmail.com>"
|
||||
|
||||
@@ -46,7 +46,6 @@ X11TOOLS = "\
|
||||
"
|
||||
|
||||
RDEPENDS:${PN} = "\
|
||||
blktool \
|
||||
${KEXECTOOLS} \
|
||||
alsa-utils-amixer \
|
||||
alsa-utils-aplay \
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
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 <alex.kanavin@gmail.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
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
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 <alex.kanavin@gmail.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
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
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 <alex.kanavin@gmail.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
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
Description: Fix FTBFS with glibc 2.28
|
||||
Author: Adrian Bunk <bunk@debian.org>
|
||||
Bug-Debian: https://bugs.debian.org/917055
|
||||
|
||||
This patch is taken from
|
||||
http://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.1.debian.tar.xz
|
||||
|
||||
Upstream-Status: Inappropriate [upstream is dead]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
--- blktool-4.orig/blktool.c
|
||||
+++ blktool-4/blktool.c
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <getopt.h>
|
||||
@@ -1,29 +0,0 @@
|
||||
SUMMARY = "Tune low-level block device parameters"
|
||||
DESCRIPTION = "blktool is used for querying and/or changing settings \
|
||||
of a block device. It is like hdparm but a more general tool, as it \
|
||||
works on SCSI, IDE and SATA devices."
|
||||
HOMEPAGE = "http://packages.debian.org/unstable/admin/blktool"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373"
|
||||
|
||||
DEPENDS = "glib-2.0"
|
||||
|
||||
SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/b/${BPN}/${BPN}_4.orig.tar.gz;name=tarball \
|
||||
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 \
|
||||
file://0004-fix-ftbfs-glibc-2.28.patch \
|
||||
"
|
||||
|
||||
SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
|
||||
SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764"
|
||||
|
||||
# for this package we're mostly interested in tracking debian patches,
|
||||
# and not in the upstream version where all development has effectively stopped
|
||||
UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/blktool/"
|
||||
UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
|
||||
|
||||
S = "${WORKDIR}/${BPN}-4.orig"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
Reference in New Issue
Block a user