Patch for debian-installer (switch to discover)

[thomas poindessous <poinde_t@epita.fr>]

Hi, I read that you are switching from libdetect to discover. I tried to
compile ddetect and it didn't work because the switch wan't finished.

Here is a patch to switch to discover :

Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/ddetect/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	2002/04/27 19:42:08	1.9
+++ Makefile	2002/05/03 14:19:43
@@ -11,8 +11,8 @@
 INSTALL=install
 STRIPTOOL=strip
 STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment 
-INCS=-I../cdebconf/src/
-LDFLAGS=-L../cdebconf/src/ -ldiscover -lisapnp -ldebconf
+INCS=-I../cdebconf/debian/build/src/
+LDFLAGS=-L../cdebconf/debian/build/src/ -ldiscover -ldebconf
 
 
 all: lst2header $(OBJS) $(PROGS)
@@ -30,7 +30,7 @@
 	$(CC) $< -o $@ $(OBJS) $(CFLAGS) $(INCS) $(LDFLAGS)
 
 lst2header: lst2header.c
-	$(CC) lst2header.c -o lst2header -ldiscover -lisapnp 
+	$(CC) lst2header.c -o lst2header -ldiscover
 
 clean:
 	$(RM) *.o $(PROGS) lst2header
Index: ethdetect.c
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/ddetect/ethdetect.c,v
retrieving revision 1.9
diff -u -r1.9 ethdetect.c
--- ethdetect.c	2001/01/30 09:16:58	1.9
+++ ethdetect.c	2002/05/03 14:19:43
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <detect.h>
+#include <discover.h>
 #include <debconfclient.h>
 #include <string.h>
 #include "utils.h"
Index: lst2header.c
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/ddetect/lst2header.c,v
retrieving revision 1.3
diff -u -r1.3 lst2header.c
--- lst2header.c	2001/01/03 06:54:11	1.3
+++ lst2header.c	2002/05/03 14:19:43
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "detect.h"
+#include <discover.h>
 
 
 #define PATH_ISA_LST "lst/isa.lst"
@@ -65,7 +65,7 @@
     }
 
   /* Initialize hardware device list                                  */
-  lst = init_lst (PATH_ISA_LST, PATH_PCI_LST, PATH_PCMCIA_LST, PATH_USB_LST);
+  lst = init_lst (PATH_PCI_LST, PATH_PCMCIA_LST, PATH_USB_LST);
 
   time (&t);
   printf ("/* \tThis file generated on %s", ctime (&t));

------------------

I have changed the path to cdebconf because it didn't compile. But maybe I
didn't do the right thing (./debian/rules build in tools/cdebconf/)

And it would be a good thing if somebody write a doc about debian-installer
and a TODO list.

Thanks.

-- 
Thomas Poindessous
thomas@poindessous.com



-- 
To UNSUBSCRIBE, email to debian-boot-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org