Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/sedutil/files/, sys-block/sedutil/
Date: Tue, 07 Nov 2017 10:01:01
Message-Id: 1510048848.c7887bb5bc242b85ee4df2441e7e75d9bbd3871f.polynomial-c@gentoo
1 commit: c7887bb5bc242b85ee4df2441e7e75d9bbd3871f
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 7 09:50:16 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 7 10:00:48 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7887bb5
7
8 sys-block/sedutil: Removed old.
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.4
11
12 sys-block/sedutil/Manifest | 1 -
13 sys-block/sedutil/files/nvme.h | 90 -----------------------------------
14 sys-block/sedutil/sedutil-1.12.ebuild | 49 -------------------
15 3 files changed, 140 deletions(-)
16
17 diff --git a/sys-block/sedutil/Manifest b/sys-block/sedutil/Manifest
18 index caeacb3a4ee..1490eaa3d9c 100644
19 --- a/sys-block/sedutil/Manifest
20 +++ b/sys-block/sedutil/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST sedutil-1.12.tar.gz 214066 SHA256 5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1 SHA512 f17fbb5a6d71d5bdd59d0fc85eed11036a8e365545133bc1374a733ce1975d6c8dd2cdc500bd46cffbec1f2bef621a98ca392e0dd314734c1ef12c073d70b0de WHIRLPOOL 299e35256de3c49a717fff727f45a1aaeeb2f65e1e3fb8afc4ba0af1626101e0f95618f182a32d90fee6278d980670df2c444219346fb6783fbe630d11209970
23 DIST sedutil-1.15.1.tar.gz 297551 SHA256 9259466b4f73af276153c5245834a56f48f8721ea7263611b5d5e8326bc43d9e SHA512 9708ef307b457fad2f45735b044685ac6731c353af428c49ff0e312190f3bdc521bcfa71a9e1239d9ffe637d18293a99b09b7e001df96494cdce53f5442750f1 WHIRLPOOL 03152fc3440a8dfdc59c3bd3c679b38bc583e77984b38d3cbbece80f86ebd933adb0c5ee6f4ab510a0769143bb1e4578faf3132f88f984f5cda4a58f42ae56e4
24 DIST sedutil-1.15.tar.gz 295399 SHA256 6711fa34c95a96066570e2b1bca05fc7ecd825e817fd675683db76a58fa4d797 SHA512 f4071d510db8227c7a4e37e1055993436cd8469e584cdb9d2bf507e006570c103b9e19353733f4ba6631226856c9d2aa8817c134febf96750318cffc935707da WHIRLPOOL 4e417269dbea3f7e971240fedc627a80fc1ccc80bc1a664d472fd2bdc13ba774adb46d49b8ac9ff83cad2141c84858038d7e150edc035414c9414faab53eb2db
25
26 diff --git a/sys-block/sedutil/files/nvme.h b/sys-block/sedutil/files/nvme.h
27 deleted file mode 100644
28 index 448aca0279f..00000000000
29 --- a/sys-block/sedutil/files/nvme.h
30 +++ /dev/null
31 @@ -1,90 +0,0 @@
32 -/* stub to deal with renamed/neutered nvme.h header */
33 -
34 -#include <linux/types.h>
35 -#include <linux/nvme_ioctl.h>
36 -
37 -struct nvme_id_power_state {
38 - __le16 max_power; /* centiwatts */
39 - __u8 rsvd2;
40 - __u8 flags;
41 - __le32 entry_lat; /* microseconds */
42 - __le32 exit_lat; /* microseconds */
43 - __u8 read_tput;
44 - __u8 read_lat;
45 - __u8 write_tput;
46 - __u8 write_lat;
47 - __le16 idle_power;
48 - __u8 idle_scale;
49 - __u8 rsvd19;
50 - __le16 active_power;
51 - __u8 active_work_scale;
52 - __u8 rsvd23[9];
53 -};
54 -
55 -enum {
56 - NVME_PS_FLAGS_MAX_POWER_SCALE = 1 << 0,
57 - NVME_PS_FLAGS_NON_OP_STATE = 1 << 1,
58 -};
59 -
60 -struct nvme_id_ctrl {
61 - __le16 vid;
62 - __le16 ssvid;
63 - char sn[20];
64 - char mn[40];
65 - char fr[8];
66 - __u8 rab;
67 - __u8 ieee[3];
68 - __u8 mic;
69 - __u8 mdts;
70 - __le16 cntlid;
71 - __le32 ver;
72 - __u8 rsvd84[172];
73 - __le16 oacs;
74 - __u8 acl;
75 - __u8 aerl;
76 - __u8 frmw;
77 - __u8 lpa;
78 - __u8 elpe;
79 - __u8 npss;
80 - __u8 avscc;
81 - __u8 apsta;
82 - __le16 wctemp;
83 - __le16 cctemp;
84 - __u8 rsvd270[242];
85 - __u8 sqes;
86 - __u8 cqes;
87 - __u8 rsvd514[2];
88 - __le32 nn;
89 - __le16 oncs;
90 - __le16 fuses;
91 - __u8 fna;
92 - __u8 vwc;
93 - __le16 awun;
94 - __le16 awupf;
95 - __u8 nvscc;
96 - __u8 rsvd531;
97 - __le16 acwu;
98 - __u8 rsvd534[2];
99 - __le32 sgls;
100 - __u8 rsvd540[1508];
101 - struct nvme_id_power_state psd[32];
102 - __u8 vs[1024];
103 -};
104 -
105 -enum nvme_admin_opcode {
106 - nvme_admin_delete_sq = 0x00,
107 - nvme_admin_create_sq = 0x01,
108 - nvme_admin_get_log_page = 0x02,
109 - nvme_admin_delete_cq = 0x04,
110 - nvme_admin_create_cq = 0x05,
111 - nvme_admin_identify = 0x06,
112 - nvme_admin_abort_cmd = 0x08,
113 - nvme_admin_set_features = 0x09,
114 - nvme_admin_get_features = 0x0a,
115 - nvme_admin_async_event = 0x0c,
116 - nvme_admin_activate_fw = 0x10,
117 - nvme_admin_download_fw = 0x11,
118 - nvme_admin_format_nvm = 0x80,
119 - nvme_admin_security_send = 0x81,
120 - nvme_admin_security_recv = 0x82,
121 -};
122
123 diff --git a/sys-block/sedutil/sedutil-1.12.ebuild b/sys-block/sedutil/sedutil-1.12.ebuild
124 deleted file mode 100644
125 index 4f808a65ebe..00000000000
126 --- a/sys-block/sedutil/sedutil-1.12.ebuild
127 +++ /dev/null
128 @@ -1,49 +0,0 @@
129 -# Copyright 1999-2016 Gentoo Foundation
130 -# Distributed under the terms of the GNU General Public License v2
131 -
132 -EAPI="5"
133 -
134 -inherit toolchain-funcs
135 -
136 -DESCRIPTION="The Drive Trust Alliance Self Encrypting Drive Utility"
137 -HOMEPAGE="https://github.com/Drive-Trust-Alliance/sedutil"
138 -SRC_URI="https://github.com/Drive-Trust-Alliance/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
139 -
140 -LICENSE="GPL-3+"
141 -SLOT="0"
142 -KEYWORDS="~amd64 ~x86"
143 -IUSE=""
144 -
145 -src_prepare() {
146 - # https://github.com/Drive-Trust-Alliance/sedutil/pull/49
147 - find -name '*.mk' -exec sed -E -i 's: -(Werror|g|O[0-9]?) : :g' {} + || die
148 - # https://github.com/Drive-Trust-Alliance/sedutil/issues/52
149 - if has_version '>=sys-kernel/linux-headers-4.4' ; then
150 - mkdir linux/linux || die
151 - cp "${FILESDIR}"/nvme.h linux/linux/ || die
152 - fi
153 -}
154 -
155 -src_configure() {
156 - case $(tc-arch) in
157 - x86) sedutil_arch="Release_i686" ;;
158 - amd64) sedutil_arch="Release_x86_64" ;;
159 - *) die "unsupported architecture" ;;
160 - esac
161 -}
162 -
163 -src_compile() {
164 - emake \
165 - -C "linux/CLI" \
166 - V=1 \
167 - CONF="${sedutil_arch}" \
168 - CC="$(tc-getCC)" \
169 - CXX="$(tc-getCXX)" \
170 - CFLAGS="${CFLAGS}" \
171 - CXXFLAGS="${CXXFLAGS}"
172 -}
173 -
174 -src_install() {
175 - dobin "linux/CLI/dist/${sedutil_arch}/GNU-Linux/sedutil-cli"
176 - dodoc README.md
177 -}