Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some build fixes for pxe_ia32 platform 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18966 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen 2006-09-28 12:52:20 +00:00
parent 25ba188a07
commit 83bf699b3f
6 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jamrules
View File

@ -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 ] ;

4
build/jam/HaikuPXE Normal file
View File

@ -0,0 +1,4 @@
NotFile pxehaiku ;
NotFile haiku-pxe-image ;

5
src/bin/makebootable/platform/pxe_ia32/Jamfile
View File

@ -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 ] ;

8
src/system/boot/platform/pxe_ia32/Jamfile
View File

@ -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) ;

4
src/system/kernel/platform/pxe_ia32/Jamfile
View File

@ -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
;

28
src/tools/makebootable/platform/pxe_ia32/Jamfile
View File

@ -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