cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.44.

Browse Source
This commit is contained in:
Xin LI 2018-12-31 23:03:34 +00:00
parent f23c6e1dae
commit a48602329a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=488844
5 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/sg3_utils/Makefile
View File

@ -2,15 +2,18 @@
# $FreeBSD$
PORTNAME= sg3_utils
PORTVERSION= 1.42
PORTVERSION= 1.44
CATEGORIES= sysutils
MASTER_SITES= http://sg.danny.cz/sg/p/
MAINTAINER= delphij@FreeBSD.org
COMMENT= Set of utilities that send SCSI commands to devices
LICENSE= BSD2CLAUSE
USES= gmake libtool shebangfix tar:tgz
SHEBANG_FILES= scripts/scsi_*
SHEBANG_FILES= scripts/*
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsgutils2.so.2

6
sysutils/sg3_utils/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1466970460
SHA256 (sg3_utils-1.42.tgz) = 1dcb7a0309bd0ba3d4a83acb526973b80106ee26cd9f7398186cd3f0633c9ef3
SIZE (sg3_utils-1.42.tgz) = 1219231
TIMESTAMP = 1546295044
SHA256 (sg3_utils-1.44.tgz) = 8dae684d22e71b11353a48b16c95597af90f0cbe9bbd57f98d7f5544da5cae7b
SIZE (sg3_utils-1.44.tgz) = 1469744

18
sysutils/sg3_utils/files/patch-include_freebsd__nvme__ioctl.h Normal file
View File

@ -0,0 +1,18 @@
--- include/freebsd_nvme_ioctl.h.orig 2018-02-28 03:48:11 UTC
+++ include/freebsd_nvme_ioctl.h
@@ -151,12 +151,12 @@ struct nvme_pt_command {
*/
struct mtx * driver_lock;
};
-#else
-#include <dev/nvme/nvme.h>
-#endif
#define nvme_completion_is_error(cpl) \
((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
+#else
+#include <dev/nvme/nvme.h>
+#endif
#define NVME_CTRLR_PREFIX "/dev/nvme"
#define NVME_NS_PREFIX "ns"

14
sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c Normal file
View File

@ -0,0 +1,14 @@
--- lib/sg_pt_freebsd.c.orig 2018-06-29 09:46:13 UTC
+++ lib/sg_pt_freebsd.c
@@ -1115,7 +1115,11 @@ nvme_pt_low(struct freebsd_dev_channel *fdc_p, void *
err = ioctl(fdc_p->dev_fd, NVME_PASSTHROUGH_CMD, npcp);
if (err < 0)
return -errno; /* Assume Unix error in normal place */
+#if __FreeBSD_version <= 1200058
sct_sc = ((npcp->cpl.status.sct << 8) | npcp->cpl.status.sc);
+#else
+ sct_sc = (NVME_STATUS_GET_SCT(npcp->cpl.status) << 8 | NVME_STATUS_GET_SC(npcp->cpl.status));
+#endif
fdc_p->nvme_result = npcp->cpl.cdw0;
sg_put_unaligned_le32(npcp->cpl.cdw0,
fdc_p->cq_dw0_3 + SG_NVME_PT_CQ_RESULT);

20
sysutils/sg3_utils/pkg-plist
View File

@ -1,3 +1,4 @@
bin/rescan-scsi-bus.sh
bin/scsi_logging_level
bin/scsi_mandat
bin/scsi_readcap
@ -6,6 +7,7 @@ bin/scsi_satl
bin/scsi_start
bin/scsi_stop
bin/scsi_temperature
bin/sg_bg_ctl
bin/sg_compare_and_write
bin/sg_decode_sense
bin/sg_format
@ -39,11 +41,13 @@ bin/sg_sat_identify
bin/sg_sat_phy_event
bin/sg_sat_read_gplog
bin/sg_sat_set_features
bin/sg_seek
bin/sg_senddiag
bin/sg_ses
bin/sg_ses_microcode
bin/sg_start
bin/sg_stpg
bin/sg_stream_ctl
bin/sg_sync
bin/sg_timestamp
bin/sg_turs
@ -55,14 +59,18 @@ bin/sg_write_buffer
bin/sg_write_long
bin/sg_write_same
bin/sg_write_verify
bin/sg_write_x
bin/sg_zone
include/scsi/sg_cmds.h
include/scsi/sg_cmds_basic.h
include/scsi/sg_cmds_extra.h
include/scsi/sg_cmds_mmc.h
include/scsi/sg_cmds.h
include/scsi/sg_lib_data.h
include/scsi/sg_lib.h
include/scsi/sg_lib_data.h
include/scsi/sg_pr2serr.h
include/scsi/sg_pt.h
include/scsi/sg_pt_nvme.h
include/scsi/sg_unaligned.h
lib/libsgutils2.a
lib/libsgutils2.so
lib/libsgutils2.so.2
@ -74,6 +82,8 @@ man/man8/scsi_satl.8.gz
man/man8/scsi_start.8.gz
man/man8/scsi_stop.8.gz
man/man8/scsi_temperature.8.gz
man/man8/sg3_utils.8.gz
man/man8/sg_bg_ctl.8.gz
man/man8/sg_compare_and_write.8.gz
man/man8/sg_decode_sense.8.gz
man/man8/sg_format.8.gz
@ -107,11 +117,13 @@ man/man8/sg_sat_identify.8.gz
man/man8/sg_sat_phy_event.8.gz
man/man8/sg_sat_read_gplog.8.gz
man/man8/sg_sat_set_features.8.gz
man/man8/sg_seek.8.gz
man/man8/sg_senddiag.8.gz
man/man8/sg_ses_microcode.8.gz
man/man8/sg_ses.8.gz
man/man8/sg_ses_microcode.8.gz
man/man8/sg_start.8.gz
man/man8/sg_stpg.8.gz
man/man8/sg_stream_ctl.8.gz
man/man8/sg_sync.8.gz
man/man8/sg_timestamp.8.gz
man/man8/sg_turs.8.gz
@ -123,6 +135,6 @@ man/man8/sg_write_buffer.8.gz
man/man8/sg_write_long.8.gz
man/man8/sg_write_same.8.gz
man/man8/sg_write_verify.8.gz
man/man8/sg_write_x.8.gz
man/man8/sg_zone.8.gz
man/man8/sg3_utils.8.gz
@dir include/scsi