From af40ff0ca68409a00962fa93735436c515e513a9 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Mon, 25 Apr 2011 12:48:47 -0700 Subject: cdrtools: recipe and patch cleanup * Recipe cleanup, added missing metadata fields and fixed whitespace issues * Added Upstream-Status to patches * Confirmed that CVE-2003-0655 does not apply to this recipe as rscsi is not packaged (From OE-Core rev: f7c35ad6267c7dfd37bad9c7521488c329f879b5) Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- .../cdrtools-native/glibc-conflict-rename.patch | 8 ++++++++ .../cdrtools/cdrtools-native/no_usr_src.patch | 7 +++++++ .../cdrtools/cdrtools-native_2.01.bb | 22 +++++++++++++--------- 3 files changed, 28 insertions(+), 9 deletions(-) (limited to 'meta') 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 0b9b892aa2..2fd5696561 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch +++ b/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch @@ -1,3 +1,11 @@ +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. + +Signed-off-by: Scott Garman + Index: cdrtools-2.01/include/schily.h =================================================================== --- cdrtools-2.01.orig/include/schily.h 2009-06-18 11:30:45.000000000 +0100 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 0318d31a6d..82e57d182d 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch +++ b/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch @@ -1,3 +1,10 @@ +Remove hard-coded references to /usr/src/linux/include to avoid +host contamination. + +Upstream-Status: [Other (build-system specific)] + +Signed-off-by: Scott Garman + Index: cdrtools-2.01/DEFAULTS/Defaults.gnu =================================================================== --- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu 2008-09-22 12:42:12.000000000 +0100 diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb index 769e5e258a..aba6a455b0 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb +++ b/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb @@ -1,21 +1,25 @@ # cdrtools-native OE build file # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) - -LICENSE="GPL" -DESCRIPTION="A set of tools for CD recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html" +SUMMARY = "A set of tools for CD recording, including cdrecord" +DESCRIPTION = "A set of tools for CD recording, including cdrecord" +HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html" +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \ + file://no_usr_src.patch \ + file://glibc-conflict-rename.patch" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \ - file://no_usr_src.patch;patch=1 \ - file://glibc-conflict-rename.patch;patch=1" +SRC_URI[md5sum] = "d44a81460e97ae02931c31188fe8d3fd" +SRC_URI[sha256sum] = "728b6175069a77c4d7d92ae60108cbda81fbbf7bc7aa02e25153ccf2092f6c22" inherit native -STAGE_TEMP="${WORKDIR}/image-temp" +STAGE_TEMP = "${WORKDIR}/image-temp" do_install() { install -d ${STAGE_TEMP} -- cgit v1.2.3-54-g00ecf