diff --git a/package/base/cdrtools/cdrtools.conf b/package/base/cdrtools/cdrtools.conf index 61f0596bb..9aa44c3cb 100644 --- a/package/base/cdrtools/cdrtools.conf +++ b/package/base/cdrtools/cdrtools.conf @@ -22,6 +22,9 @@ # ./configure is a dummy script and does no work ... runconf=0 + makeinstopt="$makeinstopt INS_BASE=$root/$prefix" + +# this avoids conflicting types for e.g. blkcnt_t in types.h var_append GCC_WRAPPER_REMOVE " " "-I/usr/src/linux/include" diff --git a/package/base/cdrtools/linux-2.6.7-__user.patch b/package/base/cdrtools/linux-2.6.7-__user.patch deleted file mode 100644 index 0521efbeb..000000000 --- a/package/base/cdrtools/linux-2.6.7-__user.patch +++ /dev/null @@ -1,32 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/cdrtools/linux-2.6.7-__user.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./libscg/scsi-linux-sg.c.orig 2002-10-21 19:20:35.000000000 +0300 -+++ ./libscg/scsi-linux-sg.c 2004-06-27 15:23:02.670972688 +0300 -@@ -78,6 +78,10 @@ - #include "scsi/scsi.h" - #endif - -+#if LINUX_VERSION_CODE >= 0x020607 -+#include -+#endif -+ - #include "scsi/sg.h" - - #undef sense /* conflict in struct cdrom_generic_command */