svn commit: r245509 - in user/sbruno/pxestuff/sys/boot/i386: libi386 loader

[Sean Bruno]

Author: sbruno
Date: Wed Jan 16 22:06:00 2013
New Revision: 245509
URL: http://svnweb.freebsd.org/changeset/base/245509

Log:
  Now we come down to the linker issues between whatever functions are
  in "libhttp_pxe" and libstand.  Things compile now, but still need symbol
  resolution.

Modified:
  user/sbruno/pxestuff/sys/boot/i386/libi386/pxe.h
  user/sbruno/pxestuff/sys/boot/i386/loader/Makefile
  user/sbruno/pxestuff/sys/boot/i386/loader/conf.c

Modified: user/sbruno/pxestuff/sys/boot/i386/libi386/pxe.h
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/libi386/pxe.h	Wed Jan 16 21:52:31 2013	(r245508)
+++ user/sbruno/pxestuff/sys/boot/i386/libi386/pxe.h	Wed Jan 16 22:06:00 2013	(r245509)
@@ -38,6 +38,8 @@
  * It's for your own good. :)
  */
 
+#ifndef PXEHEADERINCLUDES
+#define PXEHEADERINCLUDES
 /* It seems that intel didn't think about ABI,
  * either that or 16bit ABI != 32bit ABI (which seems reasonable)
  * I have to thank Intel for the hair loss I incurred trying to figure
@@ -511,3 +513,4 @@ typedef struct {
 typedef struct {
 	PXENV_STATUS_t	Status;
 } PACKED t_PXENV_STOP_BASE;
+#endif

Modified: user/sbruno/pxestuff/sys/boot/i386/loader/Makefile
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/loader/Makefile	Wed Jan 16 21:52:31 2013	(r245508)
+++ user/sbruno/pxestuff/sys/boot/i386/loader/Makefile	Wed Jan 16 22:06:00 2013	(r245509)
@@ -78,7 +78,7 @@ CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-I${.CURDIR}/../btx/lib
 
 # PXE HTTP components
-CFLAGS+=	-I$(.CURDIR)/../pxe_http
+CFLAGS+=	-I$(.CURDIR)/../pxehttp
 
 # Debug me!
 #CFLAGS+=	-g

Modified: user/sbruno/pxestuff/sys/boot/i386/loader/conf.c
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/loader/conf.c	Wed Jan 16 21:52:31 2013	(r245508)
+++ user/sbruno/pxestuff/sys/boot/i386/loader/conf.c	Wed Jan 16 22:06:00 2013	(r245509)
@@ -33,6 +33,9 @@ __FBSDID("$FreeBSD$");
 #if defined(LOADER_ZFS_SUPPORT)
 #include "../zfs/libzfs.h"
 #endif
+#if defined(LOADER_HTTP_SUPPORT)
+#include "pxehttp/httpfs.h"
+#endif
 
 /*
  * We could use linker sets for some or all of these, but
@@ -47,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #ifdef LOADER_HTTP_SUPORT
 #undef LOADER_NFS_SUPPORT
-#undef LOADER_TFTP_SUPPO
+#undef LOADER_TFTP_SUPPORT
 #endif
 
 #if defined(LOADER_NFS_SUPPORT) && defined(LOADER_TFTP_SUPPORT)