From 83bf699b3fd04f7a23a2da774c280b35dc2f9eab Mon Sep 17 00:00:00 2001
From: Marcus Overhagen <marcusoverhagen@gmail.com>
Date: Thu, 28 Sep 2006 12:52:20 +0000
Subject: [PATCH] some build fixes for pxe_ia32 platform

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18966 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 Jamrules                                      |  3 ++
 build/jam/HaikuPXE                            |  4 +++
 .../makebootable/platform/pxe_ia32/Jamfile    |  5 +++-
 src/system/boot/platform/pxe_ia32/Jamfile     |  8 ++++++
 src/system/kernel/platform/pxe_ia32/Jamfile   |  4 +--
 .../makebootable/platform/pxe_ia32/Jamfile    | 28 ++-----------------
 6 files changed, 23 insertions(+), 29 deletions(-)
 create mode 100644 build/jam/HaikuPXE

diff --git a/Jamrules b/Jamrules
index f99d8c9258..1b77805fb2 100644
--- a/Jamrules
+++ b/Jamrules
@@ -47,3 +47,6 @@ PrepareConfigVariables ;
 
 # specify the Haiku image contents
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;
+
+# for creating PXE targets
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPXE ] ;
diff --git a/build/jam/HaikuPXE b/build/jam/HaikuPXE
new file mode 100644
index 0000000000..b847d76c9c
--- /dev/null
+++ b/build/jam/HaikuPXE
@@ -0,0 +1,4 @@
+
+NotFile pxehaiku ;
+
+NotFile haiku-pxe-image ;
diff --git a/src/bin/makebootable/platform/pxe_ia32/Jamfile b/src/bin/makebootable/platform/pxe_ia32/Jamfile
index ff60f1b0ba..fe8d24eebb 100644
--- a/src/bin/makebootable/platform/pxe_ia32/Jamfile
+++ b/src/bin/makebootable/platform/pxe_ia32/Jamfile
@@ -1,6 +1,9 @@
-SubDir HAIKU_TOP src bin makebootable platform bios_ia32 ;
+SubDir HAIKU_TOP src bin makebootable platform pxe_ia32 ;
 
 # write the stage 1 boot loader into the makebootable resources
 AddFileDataResource makebootable : RAWT:666:BootCode : stage1.bin ;
 
 BinCommand makebootable : makebootable.cpp : be ;
+
+SEARCH on [ FGristFiles makebootable.cpp ]
+	= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;
diff --git a/src/system/boot/platform/pxe_ia32/Jamfile b/src/system/boot/platform/pxe_ia32/Jamfile
index 6d1ee3385e..de6368514b 100644
--- a/src/system/boot/platform/pxe_ia32/Jamfile
+++ b/src/system/boot/platform/pxe_ia32/Jamfile
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src system boot platform pxe_ia32 ;
 
+SubDirHdrs $(SUBDIR) $(DOTDOT) bios_ia32 ;
+SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform bios_ia32 ;
 SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
 
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
@@ -44,9 +46,15 @@ KernelMergeObject boot_platform_pxe_ia32.o :
 
 SEARCH on [ FGristFiles $(bios_ia32_src) ]
 	= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;
+
 SEARCH on [ FGristFiles text_menu.cpp ]
 	= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
 
+# We also need the bios_ia32 stage1.bin for building bin/makebootable
+SEARCH on stage1.bin
+ 	= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;
+
 # Tell the build system to where stage1.bin can be found, so it can be used
 # elsewhere.
 SEARCH on pxe_stage1.bin = $(SUBDIR) ;
+
diff --git a/src/system/kernel/platform/pxe_ia32/Jamfile b/src/system/kernel/platform/pxe_ia32/Jamfile
index becc0e4fc8..e475ec36a3 100644
--- a/src/system/kernel/platform/pxe_ia32/Jamfile
+++ b/src/system/kernel/platform/pxe_ia32/Jamfile
@@ -1,8 +1,8 @@
-SubDir HAIKU_TOP src system kernel platform bios_ia32 ;
+SubDir HAIKU_TOP src system kernel platform pxe_ia32 ;
 
 SubDirCcFlags $(TARGET_KERNEL_PIC_CCFLAGS) ;
 SubDirC++Flags $(TARGET_KERNEL_PIC_CCFLAGS) ;
 
-KernelMergeObject kernel_platform_bios_ia32.o :
+KernelMergeObject kernel_platform_pxe_ia32.o :
 	platform.cpp
 ;
diff --git a/src/tools/makebootable/platform/pxe_ia32/Jamfile b/src/tools/makebootable/platform/pxe_ia32/Jamfile
index 504651fb3f..743c0f3e7c 100644
--- a/src/tools/makebootable/platform/pxe_ia32/Jamfile
+++ b/src/tools/makebootable/platform/pxe_ia32/Jamfile
@@ -1,27 +1,3 @@
-SubDir HAIKU_TOP src tools makebootable platform bios_ia32 ;
+SubDir HAIKU_TOP src tools makebootable platform pxe_ia32 ;
 
-UsePrivateHeaders storage ;
-
-SEARCH_SOURCE
-	+= [ FDirName $(HAIKU_TOP) src bin makebootable platform bios_ia32 ] ;
-
-USES_BE_API on <build>makebootable = true ;
-
-local hostPlatformSources ;
-if $(HOST_PLATFORM) = linux {
-	hostPlatformSources = PartitionMap.cpp PartitionMapParser.cpp ;
-
-	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel
-		partitioning_systems intel ] ;
-
-	DEFINES += _USER_MODE ;
-}
-
-# write the stage 1 boot loader into the makebootable resources
-AddFileDataResource <build>makebootable : RAWT:666:BootCode : stage1.bin ;
-
-BuildPlatformMain <build>makebootable :
-	makebootable.cpp
-	$(hostPlatformSources)
-	: $(HOST_LIBBE)
-;
+# we don't need this tool for creating PXE boot image
\ No newline at end of file