i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build of intel partitioning add-on by building its own MBR.

Browse Source 
It previously shared the same generated MBR header with bin/writembr,
but they have incompatible needs. The intel partitioning add-on only
wants the MBR code, while writembr wants the whole sector.

Build the desired version of the MBR separately for each target instead
of sharing a single header.
This commit is contained in:
Michael Lotz
2014-10-29 23:29:18 +01:00
parent 524709ea2b
commit f65b805f6f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/partitioning_systems/intel/Jamfile
+10 -3
View File
@@ -2,10 +2,17 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems intel ;
UsePrivateHeaders kernel shared storage ; UsePrivateHeaders kernel shared storage ;
UsePrivateSystemHeaders ; UsePrivateSystemHeaders ;
UseHeaders [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) bin writembr ] ;
Includes [ FGristFiles PartitionMapWriter.cpp ] # Assemble the MBR code, and convert it into a header file
: <src!bin!writembr>MBR.h ;
NASMFLAGS on [ FGristFiles mbr.bin ] = -f bin -O5 -dMBR_CODE_ONLY=1 ;
SEARCH on mbr.nasm = [ FDirName $(HAIKU_TOP) src bin writembr ] ;
Object [ FGristFiles mbr.bin ] : mbr.nasm ;
DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ]
: kMBR : kMBRSize ;
KernelAddon intel : KernelAddon intel :
intel.cpp intel.cpp