[Lunar-commits] CVS: moonbase/cd/eject eject-2.0.13-kernel25-support.patch, NONE, 1.1 BUILD, 1.4, 1.5 DETAILS, 1.6, 1.7

[Chad Kittel]

Update of /var/cvs/lunar/moonbase/cd/eject
In directory espresso.foo-projects.org:/tmp/cvs-serv26912/eject

Modified Files:
	BUILD DETAILS 
Added Files:
	eject-2.0.13-kernel25-support.patch 
Log Message:
I thought this patch was added a long time ago when I first found it.. 
*shrug*  Anyhow, this patch makes eject 2.6 friendly.


--- NEW FILE: eject-2.0.13-kernel25-support.patch ---
--- eject.c.orig	2002-12-09 22:28:08.000000000 +0000
+++ eject.c	2003-11-08 17:06:43.000000000 +0000
@@ -58,7 +58,13 @@
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <sys/mtio.h>
-#include <linux/types.h>
+#ifndef __KERNEL__
+# define __KERNEL__
+# include <linux/types.h>
+# undef __KERNEL__
+#else
+# include <linux/types.h>
+#endif
 #include <linux/cdrom.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
 #include <linux/ucdrom.h>

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/cd/eject/BUILD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BUILD	4 Aug 2004 20:02:28 -0000	1.4
+++ BUILD	12 Nov 2004 23:50:24 -0000	1.5
@@ -1,6 +1,11 @@
 (
 
-  sedit "s:-I/usr/src/linux -I/usr/src/linux/include::" Makefile.in  &&
-  default_build 
+  # 2.6 kernel support
+  patch_it $SCRIPT_DIRECTORY/eject-2.0.13-kernel25-support.patch 0 &&
+
+  sedit "s:-I/usr/src/linux -I/usr/src/linux/include::" Makefile.in &&
+  default_build &&
+
+  gather_docs PROBLEMS PORTING
 
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/cd/eject/DETAILS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DETAILS	5 Oct 2004 09:29:52 -0000	1.6
+++ DETAILS	12 Nov 2004 23:50:24 -0000	1.7
@@ -3,11 +3,11 @@
           SOURCE=$MODULE-$VERSION.tar.gz
    SOURCE_URL[0]=http://members.rogers.com/jefftranter/
    SOURCE_URL[1]=ftp://ftp.ibiblio.org/pub/Linux/utils/disk-management/
-      SOURCE_VFY=md5:b796ad77beb4e7bdd08d6149701ab778
-        WEB_SITE=http://www.pobox.com/~tranter/eject.html
+      SOURCE_VFY=sha1:354b4e6e892aa4553ccbdb52c61db4ffa4028211
+        WEB_SITE=http://eject.sourceforge.net/
          ENTERED=20010922
          UPDATED=20040804
-           SHORT="eject is a program for ejecting removable media under software control."
+           SHORT="A program used to eject a disc from the CD-ROM drive"
 
 cat << EOF
 Eject is a program for ejecting removable media under software control.