Signed-off-by: Andrei Dinu <[email protected]>
---
.../cdrtools-native/glibc-conflict-rename.patch | 228 ++++++++------------
.../cdrtools/cdrtools-native/no_usr_src.patch | 46 ++--
...ools-native_2.01.bb => cdrtools-native_3.00.bb} | 10 +-
3 files changed, 117 insertions(+), 167 deletions(-)
rename meta/recipes-devtools/cdrtools/{cdrtools-native_2.01.bb =>
cdrtools-native_3.00.bb} (75%)
diff --git
a/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch
b/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch
index 2fd5696..63aac90 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch
@@ -1,16 +1,32 @@
-This patch fixes collisions between locally defined functions
-and glibc's fexecve() and getline() functions.
+From 9cb7111c327028d42595518e78699a878ee2edf7 Mon Sep 17 00:00:00 2001
+From: Andrei Dinu <[email protected]>
+Date: Thu, 9 May 2013 18:06:33 +0300
+Subject: [PATCH] This patch fixes collisions between locally defined
+ functions and glibc's fexecve() and getline() functions.
Upstream-Status: Inappropriate [Other]
-Upstream no longer maintains a GPL version of this utility.
+Upstream no longer maintains a GPL version of this utility
+Signed-off-by: Andrei Dinu <[email protected]>
Signed-off-by: Scott Garman <[email protected]>
+---
+ include/schily/schily.h | 4 ++--
+ libscg/scsitransp.c | 2 +-
+ libschily/fexec.c | 6 +++---
+ libschily/stdio/fgetline.c | 2 +-
+ readcd/io.c | 4 ++--
+ readcd/readcd.c | 4 ++--
+ scgcheck/scgcheck.c | 2 +-
+ scgcheck/sense.c | 2 +-
+ 8 files changed, 13 insertions(+), 13 deletions(-)
-Index: cdrtools-2.01/include/schily.h
-===================================================================
---- cdrtools-2.01.orig/include/schily.h 2009-06-18 11:30:45.000000000
+0100
-+++ cdrtools-2.01/include/schily.h 2009-06-18 11:31:22.000000000 +0100
-@@ -108,7 +108,7 @@
+diff --git a/include/schily/schily.h b//include/schily/schily.h
+old mode 100644
+new mode 100755
+index 11830c7..2cd1fef
+--- a/include/schily/schily.h
++++ b/include/schily/schily.h
+@@ -174,7 +174,7 @@ extern int fexecle __PR((const char *, FILE *,
FILE *, FILE *,
/* 6th arg not const, fexecv forces av[ac] = NULL */
extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
char **));
@@ -18,9 +34,9 @@ Index: cdrtools-2.01/include/schily.h
+extern int fexecve_schily __PR((const char *, FILE *, FILE *, FILE
*,
char * const *, char * const *));
extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const
*));
- extern int fspawnl __PR((FILE *, FILE *, FILE *,
-@@ -187,7 +187,7 @@
- extern char *findbytes __PR((const void *, int, char));
+ extern int fspawnl __PR((FILE *, FILE *, FILE *, const char *,
...));
+@@ -311,7 +311,7 @@ extern char *findbytes __PR((const void *, ssize_t,
char));
+ extern char *findinpath __PR((char *__name, int __mode, BOOL
__plain_file));
extern int findline __PR((const char *, char, const char *,
int, char **, int));
-extern int getline __PR((char *, int));
@@ -28,11 +44,13 @@ Index: cdrtools-2.01/include/schily.h
extern int getstr __PR((char *, int));
extern int breakline __PR((char *, char, char **, int));
extern int getallargs __PR((int *, char * const**, const char *,
...));
-Index: cdrtools-2.01/libscg/scsitransp.c
-===================================================================
---- cdrtools-2.01.orig/libscg/scsitransp.c 2009-06-18 11:33:57.000000000
+0100
-+++ cdrtools-2.01/libscg/scsitransp.c 2009-06-18 11:34:24.000000000 +0100
-@@ -323,7 +323,7 @@
+diff --git a/libscg/scsitransp.c b//libscg/scsitransp.c
+old mode 100644
+new mode 100755
+index 2c483fe..4ca62e5
+--- a/libscg/scsitransp.c
++++ b/libscg/scsitransp.c
+@@ -338,7 +338,7 @@ scg_yes(msg)
js_printf("%s", msg);
flush();
@@ -41,11 +59,13 @@ Index: cdrtools-2.01/libscg/scsitransp.c
exit(EX_BAD);
if (streql(okbuf, "y") || streql(okbuf, "yes") ||
streql(okbuf, "Y") || streql(okbuf, "YES"))
-Index: cdrtools-2.01/libschily/fexec.c
-===================================================================
---- cdrtools-2.01.orig/libschily/fexec.c 2009-06-18 11:29:29.000000000
+0100
-+++ cdrtools-2.01/libschily/fexec.c 2009-06-18 11:30:36.000000000 +0100
-@@ -159,7 +159,7 @@
+diff --git a/libschily/fexec.c b//libschily/fexec.c
+old mode 100644
+new mode 100755
+index 5a5c988..ed8fe5d
+--- a/libschily/fexec.c
++++ b/libschily/fexec.c
+@@ -198,7 +198,7 @@ const char **pav;
} while (p != NULL);
va_end(args);
@@ -54,7 +74,7 @@ Index: cdrtools-2.01/libschily/fexec.c
if (av != xav)
free(av);
return (ret);
-@@ -173,11 +173,11 @@
+@@ -212,11 +212,11 @@ fexecv(name, in, out, err, ac, av)
char *av[];
{
av[ac] = NULL; /* force list to be null terminated */
@@ -68,11 +88,13 @@ Index: cdrtools-2.01/libschily/fexec.c
const char *name;
FILE *in, *out, *err;
char * const av[], * const env[];
-Index: cdrtools-2.01/libschily/stdio/fgetline.c
-===================================================================
---- cdrtools-2.01.orig/libschily/stdio/fgetline.c 2009-06-18
11:28:14.000000000 +0100
-+++ cdrtools-2.01/libschily/stdio/fgetline.c 2009-06-18 11:28:55.000000000
+0100
-@@ -64,7 +64,7 @@
+diff --git a/libschily/stdio/fgetline.c b//libschily/stdio/fgetline.c
+old mode 100644
+new mode 100755
+index 090cf7c..1c71962
+--- a/libschily/stdio/fgetline.c
++++ b/libschily/stdio/fgetline.c
+@@ -61,7 +61,7 @@ fgetline(f, buf, len)
}
EXPORT int
@@ -81,11 +103,13 @@ Index: cdrtools-2.01/libschily/stdio/fgetline.c
char *buf;
int len;
{
-Index: cdrtools-2.01/readcd/io.c
-===================================================================
---- cdrtools-2.01.orig/readcd/io.c 2009-06-18 11:33:57.000000000 +0100
-+++ cdrtools-2.01/readcd/io.c 2009-06-18 11:34:38.000000000 +0100
-@@ -138,7 +138,7 @@
+diff --git a/readcd/io.c b//readcd/io.c
+old mode 100644
+new mode 100755
+index 247dc49..91e1f42
+--- a/readcd/io.c
++++ b/readcd/io.c
+@@ -136,7 +136,7 @@ getvalue(s, lp, mini, maxi, prt, cvt, dp)
(*prt)(s, *lp, mini, maxi, dp);
flush();
line[0] = '\0';
@@ -94,20 +118,22 @@ Index: cdrtools-2.01/readcd/io.c
exit(EX_BAD);
linep = skipwhite(line);
-@@ -205,7 +205,7 @@
+@@ -204,7 +204,7 @@ again:
printf("%r", form, args);
va_end(args);
flush();
-- if (getline(okbuf, sizeof(okbuf)) == EOF)
-+ if (getline_schily(okbuf, sizeof(okbuf)) == EOF)
+- if (getline(okbuf, sizeof (okbuf)) == EOF)
++ if (getline_schily(okbuf, sizeof (okbuf)) == EOF)
exit(EX_BAD);
if (okbuf[0] == '?') {
printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the
previous asked question.\n");
-Index: cdrtools-2.01/readcd/readcd.c
-===================================================================
---- cdrtools-2.01.orig/readcd/readcd.c 2009-06-18 11:33:58.000000000 +0100
-+++ cdrtools-2.01/readcd/readcd.c 2009-06-18 11:35:03.000000000 +0100
-@@ -1651,7 +1651,7 @@
+diff --git a/readcd/readcd.c b//readcd/readcd.c
+old mode 100644
+new mode 100755
+index 3b87906..2e60bd1
+--- a/readcd/readcd.c
++++ b/readcd/readcd.c
+@@ -2110,7 +2110,7 @@ read_generic(scgp, parmp, rfunc, rp, dfunc)
error("Copy from SCSI (%d,%d,%d) disk to file\n",
scg_scsibus(scgp), scg_target(scgp),
scg_lun(scgp));
error("Enter filename [%s]: ", defname); flush();
@@ -116,7 +142,7 @@ Index: cdrtools-2.01/readcd/readcd.c
}
if (askrange) {
-@@ -1820,7 +1820,7 @@
+@@ -2297,7 +2297,7 @@ write_disk(scgp, parmp)
error("Copy from file to SCSI (%d,%d,%d) disk\n",
scg_scsibus(scgp), scg_target(scgp),
scg_lun(scgp));
error("Enter filename [%s]: ", defname); flush();
@@ -125,42 +151,13 @@ Index: cdrtools-2.01/readcd/readcd.c
error("Notice: reading from file always starts at file offset
0.\n");
getlong("Enter starting sector for copy:", &addr, 0L, end-1);
-Index: cdrtools-2.01/scgcheck/dmaresid.c
-===================================================================
---- cdrtools-2.01.orig/scgcheck/dmaresid.c 2009-06-18 11:33:59.000000000
+0100
-+++ cdrtools-2.01/scgcheck/dmaresid.c 2009-06-18 11:35:43.000000000 +0100
-@@ -64,7 +64,7 @@
- printf("Ready to start test for working DMA residual count? Enter <CR> to
continue: ");
- fprintf(logfile, "**********> Testing for working DMA residual
count.\n");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) getline_schily(abuf, sizeof (abuf));
-
- printf("**********> Testing for working DMA residual count == 0.\n");
- fprintf(logfile, "**********> Testing for working DMA residual count ==
0.\n");
-@@ -95,7 +95,7 @@
- printf("Ready to start test for working DMA residual count == DMA count? Enter
<CR> to continue: ");
- fprintf(logfile, "**********> Testing for working DMA residual count == DMA
count.\n");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) getline_schily(abuf, sizeof (abuf));
- passed = TRUE;
- dmacnt = cnt;
- ret = xtinquiry(scgp, 0, dmacnt);
-@@ -130,7 +130,7 @@
- printf("Ready to start test for working DMA residual count == 1? Enter <CR>
to continue: ");
- fprintf(logfile, "**********> Testing for working DMA residual count ==
1.\n");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) getline_schily(abuf, sizeof (abuf));
- passed = TRUE;
- dmacnt = cnt+1;
- ret = xtinquiry(scgp, cnt, dmacnt);
-Index: cdrtools-2.01/scgcheck/scgcheck.c
-===================================================================
---- cdrtools-2.01.orig/scgcheck/scgcheck.c 2009-06-18 11:33:59.000000000
+0100
-+++ cdrtools-2.01/scgcheck/scgcheck.c 2009-06-18 11:35:31.000000000 +0100
-@@ -189,7 +189,7 @@
+diff --git a/scgcheck/scgcheck.c b//scgcheck/scgcheck.c
+old mode 100644
+new mode 100755
+index 3c45df1..e07ffc1
+--- a/scgcheck/scgcheck.c
++++ b/scgcheck/scgcheck.c
+@@ -191,7 +191,7 @@ Copyright (C) 1998-2008 J
break;
error("Enter SCSI device name for bus scanning [%s]: ", device);
flushit();
@@ -169,68 +166,21 @@ Index: cdrtools-2.01/scgcheck/scgcheck.c
if (device[0] == '\0')
strcpy(device, "0,6,0");
-@@ -227,7 +227,7 @@
- do {
- error("Enter SCSI device name [%s]: ", device);
- flushit();
-- (void) getline(device, sizeof (device));
-+ (void) getline_schily(device, sizeof (device));
- if (device[0] == '\0')
- strcpy(device, "0,6,0");
-
-@@ -256,7 +256,7 @@
+diff --git a/scgcheck/sense.c b//scgcheck/sense.c
+old mode 100644
+new mode 100755
+index 028bb2b..d8a028c
+--- a/scgcheck/sense.c
++++ b/scgcheck/sense.c
+@@ -116,7 +116,7 @@ scmd->cdb.cmd_cdb[9] = 0xFF;
- printf("Ready to start test for second SCSI open? Enter <CR> to continue:
");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) getline_schily(abuf, sizeof (abuf));
- #define CHECK_SECOND_OPEN
- #ifdef CHECK_SECOND_OPEN
- if (!streql(abuf, "n")) {
-@@ -344,7 +344,7 @@
-
- printf("Ready to start test for succeeded command? Enter <CR> to continue:
");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) getline_schily(abuf, sizeof (abuf));
- scgp->verbose++;
- ret = inquiry(scgp, buf, sizeof (struct scsi_inquiry));
- scg_vsetup(scgp);
-Index: cdrtools-2.01/scgcheck/sense.c
-===================================================================
---- cdrtools-2.01.orig/scgcheck/sense.c 2009-06-18 11:33:58.000000000
+0100
-+++ cdrtools-2.01/scgcheck/sense.c 2009-06-18 11:35:54.000000000 +0100
-@@ -66,7 +66,7 @@
- printf("Ready to start test for failing command? Enter <CR> to continue:
");
- fprintf(logfile, "**********> Testing for failed SCSI command.\n");
- flushit();
-- (void)getline(abuf, sizeof(abuf));
-+ (void)getline_schily(abuf, sizeof(abuf));
- /* scgp->verbose++;*/
- fillbytes(buf, sizeof(struct scsi_inquiry), '\0');
- fillbytes((caddr_t)scgp->scmd, sizeof(*scgp->scmd), '\0');
-@@ -82,13 +82,13 @@
- printf("the test utility. Otherwise remove any medium from the
drive.\n");
- printf("Ready to start test for failing command? Enter <CR> to
continue: ");
- flushit();
-- (void)getline(abuf, sizeof(abuf));
-+ (void)getline_schily(abuf, sizeof(abuf));
- ret = test_unit_ready(scgp);
- if (ret >= 0 || !scg_cmd_err(scgp)) {
- printf("Test Unit Ready did not fail.\n");
printf("Ready to eject tray? Enter <CR> to continue: ");
flushit();
-- (void)getline(abuf, sizeof(abuf));
-+ (void)getline_schily(abuf, sizeof(abuf));
- scsi_unload(scgp, (cdr_t *)0);
- ret = test_unit_ready(scgp);
- }
-@@ -127,7 +127,7 @@
- printf("Ready to start test for sense data count? Enter <CR> to continue:
");
- fprintf(logfile, "**********> Testing for SCSI sense data count.\n");
- flushit();
-- (void)getline(abuf, sizeof(abuf));
-+ (void)getline_schily(abuf, sizeof(abuf));
- printf("Testing if at least CCS_SENSE_LEN (%d) is supported...\n",
CCS_SENSE_LEN);
- fprintf(logfile, "**********> Testing if at least CCS_SENSE_LEN (%d) is
supported...\n", CCS_SENSE_LEN);
- ret = sensecount(scgp, CCS_SENSE_LEN);
+- (void) getline(abuf, sizeof (abuf));
++ (void) getline_schily(abuf, sizeof (abuf));
+ if (abuf[0] != 'n') {
+ scsi_unload(scgp, (cdr_t *)0);
+ needload = TRUE;
+--
+1.7.9.5
+
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 61df41f..7341aec 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 @@
-Remove hard-coded references to /usr/src/linux/include to avoid
-host contamination.
+From 8d835cc7185e7cd878712d8208e6aa29b227ceff Mon Sep 17 00:00:00 2001
+From: Andrei Dinu <[email protected]>
+Date: Thu, 9 May 2013 16:03:59 +0300
+Subject: [PATCH] Remove hard-coded references to /usr/src/linux/include to
+ avoid host contamination.
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Innappropriate [configuration]
+Signed-off-by: Andrei Dinu <[email protected]>
Signed-off-by: Scott Garman <[email protected]>
+---
+ cdrtools-3.00/DEFAULTS/Defaults.gnu | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100644 => 100755 cdrtools-3.00/DEFAULTS/Defaults.gnu
-Index: cdrtools-2.01/DEFAULTS/Defaults.gnu
-===================================================================
---- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu 2008-09-22 12:42:12.000000000
+0100
-+++ cdrtools-2.01/DEFAULTS/Defaults.gnu 2008-09-22 12:42:27.000000000
+0100
-@@ -18,7 +18,7 @@
+diff --git a/DEFAULTS/Defaults.gnu b/cdrtools-3.00/DEFAULTS/Defaults.gnu
+old mode 100644
+new mode 100755
+index e3e102b..8a18209
+--- a/DEFAULTS/Defaults.gnu
++++ b/DEFAULTS/Defaults.gnu
+@@ -28,7 +28,7 @@ DEFLINKMODE= static
###########################################################################
CWARNOPTS=
-DEFINCDIRS= $(SRCROOT)/include /usr/src/linux/include
+DEFINCDIRS= $(SRCROOT)/include
LDPATH= -L/opt/schily/lib
- RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
-
-Index: cdrtools-2.01/DEFAULTS/Defaults.linux
-===================================================================
---- cdrtools-2.01.orig/DEFAULTS/Defaults.linux 2008-09-22 12:42:08.000000000
+0100
-+++ cdrtools-2.01/DEFAULTS/Defaults.linux 2008-09-22 12:42:37.000000000
+0100
-@@ -18,7 +18,7 @@
- ###########################################################################
- CWARNOPTS=
-
--DEFINCDIRS= $(SRCROOT)/include /usr/src/linux/include
-+DEFINCDIRS= $(SRCROOT)/include
- LDPATH= -L/opt/schily/lib
- RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
-
+ #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
+ RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
+--
+1.7.9.5
+
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb
b/meta/recipes-devtools/cdrtools/cdrtools-native_3.00.bb
similarity index 75%
rename from meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb
rename to meta/recipes-devtools/cdrtools/cdrtools-native_3.00.bb
index fc47977..a1631b2 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.00.bb
@@ -1,4 +1,4 @@
-# cdrtools-native OE build file
+#cdrtools-native OE build file
# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
SUMMARY = "A set of tools for CD recording, including cdrecord"
@@ -6,15 +6,15 @@ DESCRIPTION = "A set of tools for CD recording, including
cdrecord"
HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html";
SECTION = "console/utils"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8d16123ffd39e649a5e4a6bc1de60e6d"
+PR = "r0"
SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
file://no_usr_src.patch \
file://glibc-conflict-rename.patch"
-SRC_URI[md5sum] = "d44a81460e97ae02931c31188fe8d3fd"
-SRC_URI[sha256sum] =
"728b6175069a77c4d7d92ae60108cbda81fbbf7bc7aa02e25153ccf2092f6c22"
+SRC_URI[md5sum] = "f9fbab08fbd458b0d2312976d8c5f558"
+SRC_URI[sha256sum] =
"7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d"
inherit native
