diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2009-05-21 07:47:02 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2009-05-21 07:47:02 +0000 |
| commit | 5b0c008d13e90d23fa5112577f2a526959d49d8e (patch) | |
| tree | 74d2f6839bf793c83fbbd65d2339fe65aa51504d | |
| parent | update audacious to 2.0.1 (diff) | |
- Support SATA disks attached to a SAS controller
- Compile with -O to prevent SCSI bus resets on amd64
Submitted by: ru
Notes
Notes:
svn path=/head/; revision=234319
| -rw-r--r-- | sysutils/smartmontools-devel/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/smartmontools-devel/files/patch-os__freebsd.cpp | 9 | ||||
| -rw-r--r-- | sysutils/smartmontools/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/smartmontools/files/patch-os__freebsd.cpp | 9 |
4 files changed, 24 insertions, 2 deletions
diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile index fa100a00b5e5..4a19f29a295e 100644 --- a/sysutils/smartmontools-devel/Makefile +++ b/sysutils/smartmontools-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.38 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,6 +25,8 @@ USE_RC_SUBR= smartd MAN5= smartd.conf.5 MAN8= smartd.8 smartctl.8 +CFLAGS:= ${CFLAGS:S/-O2/-O/} + post-patch: @${REINPLACE_CMD} -e 's| install-initdDATA | |' ${WRKSRC}/Makefile.in diff --git a/sysutils/smartmontools-devel/files/patch-os__freebsd.cpp b/sysutils/smartmontools-devel/files/patch-os__freebsd.cpp index 288eb2cc07bf..053421ead0cf 100644 --- a/sysutils/smartmontools-devel/files/patch-os__freebsd.cpp +++ b/sysutils/smartmontools-devel/files/patch-os__freebsd.cpp @@ -8,6 +8,15 @@ return -1; } +@@ -525,7 +524,7 @@ + return -1; + } + +- if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { ++ if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) { + #if __FreeBSD_version > 500000 + cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); + #endif @@ -924,6 +923,7 @@ static const char * fbsd_dev_prefix = "/dev/"; static const char * fbsd_dev_ata_disk_prefix = "ad"; diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index fa100a00b5e5..4a19f29a295e 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.38 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,6 +25,8 @@ USE_RC_SUBR= smartd MAN5= smartd.conf.5 MAN8= smartd.8 smartctl.8 +CFLAGS:= ${CFLAGS:S/-O2/-O/} + post-patch: @${REINPLACE_CMD} -e 's| install-initdDATA | |' ${WRKSRC}/Makefile.in diff --git a/sysutils/smartmontools/files/patch-os__freebsd.cpp b/sysutils/smartmontools/files/patch-os__freebsd.cpp index 288eb2cc07bf..053421ead0cf 100644 --- a/sysutils/smartmontools/files/patch-os__freebsd.cpp +++ b/sysutils/smartmontools/files/patch-os__freebsd.cpp @@ -8,6 +8,15 @@ return -1; } +@@ -525,7 +524,7 @@ + return -1; + } + +- if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { ++ if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) { + #if __FreeBSD_version > 500000 + cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); + #endif @@ -924,6 +923,7 @@ static const char * fbsd_dev_prefix = "/dev/"; static const char * fbsd_dev_ata_disk_prefix = "ad"; |