diff options
5 files changed, 234 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch b/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch new file mode 100644 index 0000000000..ccb9a02da9 --- /dev/null +++ b/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From 4cf7e16fe9b773e2e7763d4b773854eefe2aa9ab Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 3 | Date: Tue, 12 Jan 2016 09:59:55 -0200 | ||
| 4 | Subject: [PATCH] Stop using relative path for scsilib.c link | ||
| 5 | Organization: O.S. Systems Software LTDA. | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 10 | --- | ||
| 11 | Makefile.linux | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/Makefile.linux b/Makefile.linux | ||
| 15 | index 78333ff..e210564 100644 | ||
| 16 | --- a/Makefile.linux | ||
| 17 | +++ b/Makefile.linux | ||
| 18 | @@ -129,7 +129,7 @@ scsilib.c: | ||
| 19 | echo "Please specify OS={aix,linux,hpux,solaris,windows}"; \ | ||
| 20 | exit 1; \ | ||
| 21 | fi; \ | ||
| 22 | - ln -sf ../scsilib-$(OS).c scsilib.c | ||
| 23 | + ln -sf scsilib-$(OS).c scsilib.c | ||
| 24 | |||
| 25 | print:; | ||
| 26 | @$(PRINTER) $(PRINTFLAGS) $(ALL_CFILES) | ||
| 27 | -- | ||
| 28 | 2.1.4 | ||
| 29 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch b/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch new file mode 100644 index 0000000000..0c00fdf41e --- /dev/null +++ b/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch | |||
| @@ -0,0 +1,92 @@ | |||
| 1 | From e3c6eb8776f659eb9e6eeccf90d785eff18ecf74 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 3 | Date: Mon, 15 Feb 2016 18:00:05 -0200 | ||
| 4 | Subject: [PATCH] Use 'tcsh' shell | ||
| 5 | Organization: O.S. Systems Software LTDA. | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 10 | --- | ||
| 11 | Scripts/dta | 2 +- | ||
| 12 | Scripts/dtc | 2 +- | ||
| 13 | Scripts/dtf | 2 +- | ||
| 14 | Scripts/dtr | 2 +- | ||
| 15 | Scripts/dts | 2 +- | ||
| 16 | Scripts/dtt | 2 +- | ||
| 17 | Scripts/dtw | 2 +- | ||
| 18 | 7 files changed, 7 insertions(+), 7 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/Scripts/dta b/Scripts/dta | ||
| 21 | index ebc7072..4f90247 100755 | ||
| 22 | --- a/Scripts/dta | ||
| 23 | +++ b/Scripts/dta | ||
| 24 | @@ -1,4 +1,4 @@ | ||
| 25 | -#!/bin/csh | ||
| 26 | +#!/bin/tcsh | ||
| 27 | # | ||
| 28 | # Script file to test asynchronous communication lines. | ||
| 29 | # | ||
| 30 | diff --git a/Scripts/dtc b/Scripts/dtc | ||
| 31 | index da69c2e..89d48c2 100755 | ||
| 32 | --- a/Scripts/dtc | ||
| 33 | +++ b/Scripts/dtc | ||
| 34 | @@ -1,4 +1,4 @@ | ||
| 35 | -#!/bin/csh | ||
| 36 | +#!/bin/tcsh | ||
| 37 | # %Z%%M% %I% %E% | ||
| 38 | # | ||
| 39 | # Date: August 7, 1990 | ||
| 40 | diff --git a/Scripts/dtf b/Scripts/dtf | ||
| 41 | index 9f8cd87..321d261 100755 | ||
| 42 | --- a/Scripts/dtf | ||
| 43 | +++ b/Scripts/dtf | ||
| 44 | @@ -1,4 +1,4 @@ | ||
| 45 | -#! /bin/csh | ||
| 46 | +#! /bin/tcsh | ||
| 47 | # | ||
| 48 | # Script file to gather floppy disk performance data. | ||
| 49 | # | ||
| 50 | diff --git a/Scripts/dtr b/Scripts/dtr | ||
| 51 | index ddb7947..1ff5a0b 100755 | ||
| 52 | --- a/Scripts/dtr | ||
| 53 | +++ b/Scripts/dtr | ||
| 54 | @@ -1,4 +1,4 @@ | ||
| 55 | -#!/bin/csh | ||
| 56 | +#!/bin/tcsh | ||
| 57 | # %Z%%M% %I% %E% | ||
| 58 | # | ||
| 59 | # Date: August 21, 1990 | ||
| 60 | diff --git a/Scripts/dts b/Scripts/dts | ||
| 61 | index 6b8a167..42d2312 100755 | ||
| 62 | --- a/Scripts/dts | ||
| 63 | +++ b/Scripts/dts | ||
| 64 | @@ -1,4 +1,4 @@ | ||
| 65 | -#!/bin/csh | ||
| 66 | +#!/bin/tcsh | ||
| 67 | # %Z%%M% %I% %E% | ||
| 68 | # | ||
| 69 | # Date: August 7, 1990 | ||
| 70 | diff --git a/Scripts/dtt b/Scripts/dtt | ||
| 71 | index 36cc6bd..df19d2f 100755 | ||
| 72 | --- a/Scripts/dtt | ||
| 73 | +++ b/Scripts/dtt | ||
| 74 | @@ -1,4 +1,4 @@ | ||
| 75 | -#! /bin/csh | ||
| 76 | +#! /bin/tcsh | ||
| 77 | # %Z%%M% %I% %E% | ||
| 78 | # | ||
| 79 | # Date: August 7, 1990 | ||
| 80 | diff --git a/Scripts/dtw b/Scripts/dtw | ||
| 81 | index 8a4ac39..c58e304 100755 | ||
| 82 | --- a/Scripts/dtw | ||
| 83 | +++ b/Scripts/dtw | ||
| 84 | @@ -1,4 +1,4 @@ | ||
| 85 | -#!/bin/csh | ||
| 86 | +#!/bin/tcsh | ||
| 87 | # %Z%%M% %I% %E% | ||
| 88 | # | ||
| 89 | # Date: August 21, 1990 | ||
| 90 | -- | ||
| 91 | 2.1.4 | ||
| 92 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch b/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch new file mode 100644 index 0000000000..87016edf03 --- /dev/null +++ b/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | |||
| 5 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 6 | |||
| 7 | diff -rupN dt.v18.32.old/common.h dt.v18.32/common.h | ||
| 8 | --- dt.v18.32.old/common.h 2013-03-01 23:52:30.000000000 +0100 | ||
| 9 | +++ dt.v18.32/common.h 2014-09-24 17:41:40.777604710 +0200 | ||
| 10 | @@ -127,7 +127,7 @@ typedef volatile slarge_t v_slarge; | ||
| 11 | |||
| 12 | #endif /* defined(_WIN64) */ | ||
| 13 | |||
| 14 | -#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE) | ||
| 15 | +#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined (_DEFAULT_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE) | ||
| 16 | |||
| 17 | #define QuadIsLongLong | ||
| 18 | typedef unsigned long long int large_t; | ||
diff --git a/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch b/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch new file mode 100644 index 0000000000..b6780c1965 --- /dev/null +++ b/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | |||
| 5 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 6 | |||
| 7 | diff -rupN dt.v18.32.old/dt.c dt.v18.32/dt.c | ||
| 8 | --- dt.v18.32.old/dt.c 2014-08-18 14:45:53.242351115 +0200 | ||
| 9 | +++ dt.v18.32/dt.c 2014-08-18 15:11:36.367719880 +0200 | ||
| 10 | @@ -4378,7 +4378,7 @@ report_error( | ||
| 11 | (void)sprintf(dip->di_msg_buffer, "(%d): '%s', errno = %d - %s\n", | ||
| 12 | dip->di_process_id, error_info, errno, emsg); | ||
| 13 | } | ||
| 14 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
| 15 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
| 16 | } | ||
| 17 | #endif /* defined(SYSLOG) */ | ||
| 18 | |||
| 19 | diff -rupN dt.v18.32.old/dtutil.c dt.v18.32/dtutil.c | ||
| 20 | --- dt.v18.32.old/dtutil.c 2014-08-18 14:45:53.354350779 +0200 | ||
| 21 | +++ dt.v18.32/dtutil.c 2014-08-18 15:13:53.835307311 +0200 | ||
| 22 | @@ -5180,7 +5180,7 @@ ReportDeviceInfo ( | ||
| 23 | bp += Sprintf(bp, | ||
| 24 | "(%d) Device name: %s\n", | ||
| 25 | dip->di_process_id, dip->di_dname); | ||
| 26 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
| 27 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
| 28 | bp = dip->di_msg_buffer; | ||
| 29 | # if defined(SCSI) | ||
| 30 | if (dip->di_serial_number) { | ||
| 31 | @@ -5193,7 +5193,7 @@ ReportDeviceInfo ( | ||
| 32 | dip->di_process_id, dip->di_device_id); | ||
| 33 | } | ||
| 34 | # endif /* defined(SCSI) */ | ||
| 35 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
| 36 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
| 37 | bp = dip->di_msg_buffer; | ||
| 38 | bp += Sprintf(bp, | ||
| 39 | "(%d) Relative block number where the error occurred is " LUF "," | ||
| 40 | @@ -5203,7 +5203,7 @@ ReportDeviceInfo ( | ||
| 41 | } else { | ||
| 42 | bp += Sprintf(bp, "\n"); | ||
| 43 | } | ||
| 44 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
| 45 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
| 46 | } | ||
| 47 | #endif /* defined(SYSLOG) */ | ||
| 48 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt_18.32.bb b/meta-oe/recipes-devtools/dt/dt_18.32.bb new file mode 100644 index 0000000000..9688d02aac --- /dev/null +++ b/meta-oe/recipes-devtools/dt/dt_18.32.bb | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | SUMMARY = "Generic data test program" | ||
| 2 | DESCRIPTION = "The Data Test Program (dt) is a generic data test program used to verify proper \ | ||
| 3 | operation of peripherals, file systems, device drivers, or any data stream supported by the \ | ||
| 4 | operating system." | ||
| 5 | HOMEPAGE = "http://www.scsifaq.org/RMiller_Tools/dt.html" | ||
| 6 | |||
| 7 | SECTION = "console/tests" | ||
| 8 | |||
| 9 | LICENSE = "MIT" | ||
| 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=be8bb25bbcfaa0725710d188e5152668" | ||
| 11 | |||
| 12 | # Source URI taken from Fedora RPM spec file at: | ||
| 13 | # http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
| 14 | SRC_URI = "http://dl.dropboxusercontent.com/u/32363629/Datatest/dt-source-v${PV}.tar.gz \ | ||
| 15 | file://dt-default-source-define.patch \ | ||
| 16 | file://dt-wformat-security.patch \ | ||
| 17 | file://Stop-using-relative-path-for-scsilib.c-link.patch \ | ||
| 18 | file://Use-tcsh-shell.patch \ | ||
| 19 | " | ||
| 20 | |||
| 21 | SRC_URI[md5sum] = "3054aeaaba047a1dbe90c2132a382ee2" | ||
| 22 | SRC_URI[sha256sum] = "10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6" | ||
| 23 | |||
| 24 | S = "${WORKDIR}/dt.v${PV}" | ||
| 25 | |||
| 26 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
| 27 | |||
| 28 | EXTRA_OEMAKE += "-f Makefile.linux \ | ||
| 29 | OS=linux \ | ||
| 30 | CFLAGS="-I.. -DAIO -DFIFO -DMMAP -D__linux__ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DTHREADS -DSCSI"" | ||
| 31 | |||
| 32 | do_compile() { | ||
| 33 | oe_runmake | ||
| 34 | } | ||
| 35 | |||
| 36 | do_install() { | ||
| 37 | install -Dm755 dt ${D}${sbindir}/dt | ||
| 38 | install -Dm644 Documentation/dt.man ${D}${mandir}/man8/dt.8 | ||
| 39 | |||
| 40 | install -d ${D}${datadir}/dt/ | ||
| 41 | install -d ${D}${docdir}/dt/html/ | ||
| 42 | install -m755 Scripts/dt? ${D}${datadir}/dt/ | ||
| 43 | install -m644 data/pattern_* ${D}${datadir}/dt/ | ||
| 44 | install -m644 html/* ${D}${docdir}/dt/html/ | ||
| 45 | } | ||
| 46 | |||
| 47 | RDEPENDS_${PN} += "tcsh" | ||
