summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndrei Dinu <andrei.adrianx.dinu@intel.com>2013-05-17 10:37:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-21 00:18:46 +0100
commitf6d44383a1bd2360830629f7f133ba522d0abebe (patch)
tree36d946aab53ca13268b1f627bd73e3e98c3c1d20 /meta
parent25e90a44b6870953021b485eee738ebb2ff04977 (diff)
downloadpoky-f6d44383a1bd2360830629f7f133ba522d0abebe.tar.gz
cdrtools-native : upgrade to 3.00
Upgrade from 2.01 -> 3.00 - Updated md5 of the license file because new information was added by the owner. - Removed glibc-conflict-rename.patch because it is not required anymore. - Updated no_usr_src.patch because it didn't apply. (From OE-Core rev: 951a8e422be93a3d06d0149f9b070eddcdb37afb) Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch236
-rw-r--r--meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch46
-rw-r--r--meta/recipes-devtools/cdrtools/cdrtools-native_3.00.bb (renamed from meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb)11
3 files changed, 28 insertions, 265 deletions
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch b/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch
deleted file mode 100644
index 2fd5696561..0000000000
--- a/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch
+++ /dev/null
@@ -1,236 +0,0 @@
1This patch fixes collisions between locally defined functions
2and glibc's fexecve() and getline() functions.
3
4Upstream-Status: Inappropriate [Other]
5Upstream no longer maintains a GPL version of this utility.
6
7Signed-off-by: Scott Garman <scott.a.garman@intel.com>
8
9Index: cdrtools-2.01/include/schily.h
10===================================================================
11--- cdrtools-2.01.orig/include/schily.h 2009-06-18 11:30:45.000000000 +0100
12+++ cdrtools-2.01/include/schily.h 2009-06-18 11:31:22.000000000 +0100
13@@ -108,7 +108,7 @@
14 /* 6th arg not const, fexecv forces av[ac] = NULL */
15 extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
16 char **));
17-extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
18+extern int fexecve_schily __PR((const char *, FILE *, FILE *, FILE *,
19 char * const *, char * const *));
20 extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
21 extern int fspawnl __PR((FILE *, FILE *, FILE *,
22@@ -187,7 +187,7 @@
23 extern char *findbytes __PR((const void *, int, char));
24 extern int findline __PR((const char *, char, const char *,
25 int, char **, int));
26-extern int getline __PR((char *, int));
27+extern int getline_schily __PR((char *, int));
28 extern int getstr __PR((char *, int));
29 extern int breakline __PR((char *, char, char **, int));
30 extern int getallargs __PR((int *, char * const**, const char *, ...));
31Index: cdrtools-2.01/libscg/scsitransp.c
32===================================================================
33--- cdrtools-2.01.orig/libscg/scsitransp.c 2009-06-18 11:33:57.000000000 +0100
34+++ cdrtools-2.01/libscg/scsitransp.c 2009-06-18 11:34:24.000000000 +0100
35@@ -323,7 +323,7 @@
36
37 js_printf("%s", msg);
38 flush();
39- if (getline(okbuf, sizeof (okbuf)) == EOF)
40+ if (getline_schily(okbuf, sizeof (okbuf)) == EOF)
41 exit(EX_BAD);
42 if (streql(okbuf, "y") || streql(okbuf, "yes") ||
43 streql(okbuf, "Y") || streql(okbuf, "YES"))
44Index: cdrtools-2.01/libschily/fexec.c
45===================================================================
46--- cdrtools-2.01.orig/libschily/fexec.c 2009-06-18 11:29:29.000000000 +0100
47+++ cdrtools-2.01/libschily/fexec.c 2009-06-18 11:30:36.000000000 +0100
48@@ -159,7 +159,7 @@
49 } while (p != NULL);
50 va_end(args);
51
52- ret = fexecve(name, in, out, err, av, env);
53+ ret = fexecve_schily(name, in, out, err, av, env);
54 if (av != xav)
55 free(av);
56 return (ret);
57@@ -173,11 +173,11 @@
58 char *av[];
59 {
60 av[ac] = NULL; /* force list to be null terminated */
61- return (fexecve(name, in, out, err, av, environ));
62+ return (fexecve_schily(name, in, out, err, av, environ));
63 }
64
65 EXPORT int
66-fexecve(name, in, out, err, av, env)
67+fexecve_schily(name, in, out, err, av, env)
68 const char *name;
69 FILE *in, *out, *err;
70 char * const av[], * const env[];
71Index: cdrtools-2.01/libschily/stdio/fgetline.c
72===================================================================
73--- cdrtools-2.01.orig/libschily/stdio/fgetline.c 2009-06-18 11:28:14.000000000 +0100
74+++ cdrtools-2.01/libschily/stdio/fgetline.c 2009-06-18 11:28:55.000000000 +0100
75@@ -64,7 +64,7 @@
76 }
77
78 EXPORT int
79-getline(buf, len)
80+getline_schily(buf, len)
81 char *buf;
82 int len;
83 {
84Index: cdrtools-2.01/readcd/io.c
85===================================================================
86--- cdrtools-2.01.orig/readcd/io.c 2009-06-18 11:33:57.000000000 +0100
87+++ cdrtools-2.01/readcd/io.c 2009-06-18 11:34:38.000000000 +0100
88@@ -138,7 +138,7 @@
89 (*prt)(s, *lp, mini, maxi, dp);
90 flush();
91 line[0] = '\0';
92- if (getline(line, 80) == EOF)
93+ if (getline_schily(line, 80) == EOF)
94 exit(EX_BAD);
95
96 linep = skipwhite(line);
97@@ -205,7 +205,7 @@
98 printf("%r", form, args);
99 va_end(args);
100 flush();
101- if (getline(okbuf, sizeof(okbuf)) == EOF)
102+ if (getline_schily(okbuf, sizeof(okbuf)) == EOF)
103 exit(EX_BAD);
104 if (okbuf[0] == '?') {
105 printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
106Index: cdrtools-2.01/readcd/readcd.c
107===================================================================
108--- cdrtools-2.01.orig/readcd/readcd.c 2009-06-18 11:33:58.000000000 +0100
109+++ cdrtools-2.01/readcd/readcd.c 2009-06-18 11:35:03.000000000 +0100
110@@ -1651,7 +1651,7 @@
111 error("Copy from SCSI (%d,%d,%d) disk to file\n",
112 scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
113 error("Enter filename [%s]: ", defname); flush();
114- (void) getline(filename, sizeof (filename));
115+ (void) getline_schily(filename, sizeof (filename));
116 }
117
118 if (askrange) {
119@@ -1820,7 +1820,7 @@
120 error("Copy from file to SCSI (%d,%d,%d) disk\n",
121 scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
122 error("Enter filename [%s]: ", defname); flush();
123- (void) getline(filename, sizeof (filename));
124+ (void) getline_schily(filename, sizeof (filename));
125 error("Notice: reading from file always starts at file offset 0.\n");
126
127 getlong("Enter starting sector for copy:", &addr, 0L, end-1);
128Index: cdrtools-2.01/scgcheck/dmaresid.c
129===================================================================
130--- cdrtools-2.01.orig/scgcheck/dmaresid.c 2009-06-18 11:33:59.000000000 +0100
131+++ cdrtools-2.01/scgcheck/dmaresid.c 2009-06-18 11:35:43.000000000 +0100
132@@ -64,7 +64,7 @@
133 printf("Ready to start test for working DMA residual count? Enter <CR> to continue: ");
134 fprintf(logfile, "**********> Testing for working DMA residual count.\n");
135 flushit();
136- (void) getline(abuf, sizeof (abuf));
137+ (void) getline_schily(abuf, sizeof (abuf));
138
139 printf("**********> Testing for working DMA residual count == 0.\n");
140 fprintf(logfile, "**********> Testing for working DMA residual count == 0.\n");
141@@ -95,7 +95,7 @@
142 printf("Ready to start test for working DMA residual count == DMA count? Enter <CR> to continue: ");
143 fprintf(logfile, "**********> Testing for working DMA residual count == DMA count.\n");
144 flushit();
145- (void) getline(abuf, sizeof (abuf));
146+ (void) getline_schily(abuf, sizeof (abuf));
147 passed = TRUE;
148 dmacnt = cnt;
149 ret = xtinquiry(scgp, 0, dmacnt);
150@@ -130,7 +130,7 @@
151 printf("Ready to start test for working DMA residual count == 1? Enter <CR> to continue: ");
152 fprintf(logfile, "**********> Testing for working DMA residual count == 1.\n");
153 flushit();
154- (void) getline(abuf, sizeof (abuf));
155+ (void) getline_schily(abuf, sizeof (abuf));
156 passed = TRUE;
157 dmacnt = cnt+1;
158 ret = xtinquiry(scgp, cnt, dmacnt);
159Index: cdrtools-2.01/scgcheck/scgcheck.c
160===================================================================
161--- cdrtools-2.01.orig/scgcheck/scgcheck.c 2009-06-18 11:33:59.000000000 +0100
162+++ cdrtools-2.01/scgcheck/scgcheck.c 2009-06-18 11:35:31.000000000 +0100
163@@ -189,7 +189,7 @@
164 break;
165 error("Enter SCSI device name for bus scanning [%s]: ", device);
166 flushit();
167- (void) getline(device, sizeof (device));
168+ (void) getline_schily(device, sizeof (device));
169 if (device[0] == '\0')
170 strcpy(device, "0,6,0");
171
172@@ -227,7 +227,7 @@
173 do {
174 error("Enter SCSI device name [%s]: ", device);
175 flushit();
176- (void) getline(device, sizeof (device));
177+ (void) getline_schily(device, sizeof (device));
178 if (device[0] == '\0')
179 strcpy(device, "0,6,0");
180
181@@ -256,7 +256,7 @@
182
183 printf("Ready to start test for second SCSI open? Enter <CR> to continue: ");
184 flushit();
185- (void) getline(abuf, sizeof (abuf));
186+ (void) getline_schily(abuf, sizeof (abuf));
187 #define CHECK_SECOND_OPEN
188 #ifdef CHECK_SECOND_OPEN
189 if (!streql(abuf, "n")) {
190@@ -344,7 +344,7 @@
191
192 printf("Ready to start test for succeeded command? Enter <CR> to continue: ");
193 flushit();
194- (void) getline(abuf, sizeof (abuf));
195+ (void) getline_schily(abuf, sizeof (abuf));
196 scgp->verbose++;
197 ret = inquiry(scgp, buf, sizeof (struct scsi_inquiry));
198 scg_vsetup(scgp);
199Index: cdrtools-2.01/scgcheck/sense.c
200===================================================================
201--- cdrtools-2.01.orig/scgcheck/sense.c 2009-06-18 11:33:58.000000000 +0100
202+++ cdrtools-2.01/scgcheck/sense.c 2009-06-18 11:35:54.000000000 +0100
203@@ -66,7 +66,7 @@
204 printf("Ready to start test for failing command? Enter <CR> to continue: ");
205 fprintf(logfile, "**********> Testing for failed SCSI command.\n");
206 flushit();
207- (void)getline(abuf, sizeof(abuf));
208+ (void)getline_schily(abuf, sizeof(abuf));
209 /* scgp->verbose++;*/
210 fillbytes(buf, sizeof(struct scsi_inquiry), '\0');
211 fillbytes((caddr_t)scgp->scmd, sizeof(*scgp->scmd), '\0');
212@@ -82,13 +82,13 @@
213 printf("the test utility. Otherwise remove any medium from the drive.\n");
214 printf("Ready to start test for failing command? Enter <CR> to continue: ");
215 flushit();
216- (void)getline(abuf, sizeof(abuf));
217+ (void)getline_schily(abuf, sizeof(abuf));
218 ret = test_unit_ready(scgp);
219 if (ret >= 0 || !scg_cmd_err(scgp)) {
220 printf("Test Unit Ready did not fail.\n");
221 printf("Ready to eject tray? Enter <CR> to continue: ");
222 flushit();
223- (void)getline(abuf, sizeof(abuf));
224+ (void)getline_schily(abuf, sizeof(abuf));
225 scsi_unload(scgp, (cdr_t *)0);
226 ret = test_unit_ready(scgp);
227 }
228@@ -127,7 +127,7 @@
229 printf("Ready to start test for sense data count? Enter <CR> to continue: ");
230 fprintf(logfile, "**********> Testing for SCSI sense data count.\n");
231 flushit();
232- (void)getline(abuf, sizeof(abuf));
233+ (void)getline_schily(abuf, sizeof(abuf));
234 printf("Testing if at least CCS_SENSE_LEN (%d) is supported...\n", CCS_SENSE_LEN);
235 fprintf(logfile, "**********> Testing if at least CCS_SENSE_LEN (%d) is supported...\n", CCS_SENSE_LEN);
236 ret = sensecount(scgp, CCS_SENSE_LEN);
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch b/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch
index 61df41f5bf..7341aecd6c 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch
@@ -1,33 +1,33 @@
1Remove hard-coded references to /usr/src/linux/include to avoid 1From 8d835cc7185e7cd878712d8208e6aa29b227ceff Mon Sep 17 00:00:00 2001
2host contamination. 2From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
3Date: Thu, 9 May 2013 16:03:59 +0300
4Subject: [PATCH] Remove hard-coded references to /usr/src/linux/include to
5 avoid host contamination.
3 6
4Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Innappropriate [configuration]
5 8
9Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
6Signed-off-by: Scott Garman <scott.a.garman@intel.com> 10Signed-off-by: Scott Garman <scott.a.garman@intel.com>
11---
12 cdrtools-3.00/DEFAULTS/Defaults.gnu | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14 mode change 100644 => 100755 cdrtools-3.00/DEFAULTS/Defaults.gnu
7 15
8Index: cdrtools-2.01/DEFAULTS/Defaults.gnu 16diff --git a/DEFAULTS/Defaults.gnu b/cdrtools-3.00/DEFAULTS/Defaults.gnu
9=================================================================== 17old mode 100644
10--- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu 2008-09-22 12:42:12.000000000 +0100 18new mode 100755
11+++ cdrtools-2.01/DEFAULTS/Defaults.gnu 2008-09-22 12:42:27.000000000 +0100 19index e3e102b..8a18209
12@@ -18,7 +18,7 @@ 20--- a/DEFAULTS/Defaults.gnu
21+++ b/DEFAULTS/Defaults.gnu
22@@ -28,7 +28,7 @@ DEFLINKMODE= static
13 ########################################################################### 23 ###########################################################################
14 CWARNOPTS= 24 CWARNOPTS=
15 25
16-DEFINCDIRS= $(SRCROOT)/include /usr/src/linux/include 26-DEFINCDIRS= $(SRCROOT)/include /usr/src/linux/include
17+DEFINCDIRS= $(SRCROOT)/include 27+DEFINCDIRS= $(SRCROOT)/include
18 LDPATH= -L/opt/schily/lib 28 LDPATH= -L/opt/schily/lib
19 RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) 29 #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
20 30 RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
21Index: cdrtools-2.01/DEFAULTS/Defaults.linux 31--
22=================================================================== 321.7.9.5
23--- cdrtools-2.01.orig/DEFAULTS/Defaults.linux 2008-09-22 12:42:08.000000000 +0100 33
24+++ cdrtools-2.01/DEFAULTS/Defaults.linux 2008-09-22 12:42:37.000000000 +0100
25@@ -18,7 +18,7 @@
26 ###########################################################################
27 CWARNOPTS=
28
29-DEFINCDIRS= $(SRCROOT)/include /usr/src/linux/include
30+DEFINCDIRS= $(SRCROOT)/include
31 LDPATH= -L/opt/schily/lib
32 RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
33
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.00.bb
index fc479774d9..7e4c381f98 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.00.bb
@@ -6,15 +6,14 @@ DESCRIPTION = "A set of tools for CD recording, including cdrecord"
6HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html" 6HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "GPLv2" 8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 9LIC_FILES_CHKSUM = "file://COPYING;md5=8d16123ffd39e649a5e4a6bc1de60e6d"
10PR = "r2" 10PR = "r0"
11 11
12SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \ 12SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
13 file://no_usr_src.patch \ 13 file://no_usr_src.patch"
14 file://glibc-conflict-rename.patch"
15 14
16SRC_URI[md5sum] = "d44a81460e97ae02931c31188fe8d3fd" 15SRC_URI[md5sum] = "f9fbab08fbd458b0d2312976d8c5f558"
17SRC_URI[sha256sum] = "728b6175069a77c4d7d92ae60108cbda81fbbf7bc7aa02e25153ccf2092f6c22" 16SRC_URI[sha256sum] = "7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d"
18 17
19inherit native 18inherit native
20 19
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 14:24:36 +0000