partitioning_systems: create libpartitioning_systemscommon for common files

Change-Id: I1b3c2f9bad60024a7a07ae4bbfe3970ac5ae42b4
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5632
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>

src/add-ons/disk_systems/intel/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders shared storage ;
 UsePrivateSystemHeaders ;
 
 SEARCH_SOURCE
-	+= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ;
+	+= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems common ] ;
 
 {
 	local defines = [ FDefines _USER_MODE ] ;

src/add-ons/kernel/partitioning_systems/Jamfile

@@ -3,6 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems ;
 HaikuSubInclude amiga ;
 HaikuSubInclude apple ;
 HaikuSubInclude atari ;
+HaikuSubInclude common ;
 HaikuSubInclude gpt ;
 HaikuSubInclude intel ;
 HaikuSubInclude session ;

src/add-ons/kernel/partitioning_systems/common/Jamfile

@@ -0,0 +1,21 @@
+SubDir HAIKU_TOP src add-ons kernel partitioning_systems common ;
+
+UsePrivateHeaders kernel storage ;
+UsePrivateSystemHeaders ;
+
+# Assemble the MBR code, and convert it into a header file
+MBRFLAGS on [ FGristFiles mbr.bin ] = -DMBR_CODE_ONLY ;
+BuildMBR [ FGristFiles mbr.bin ] : mbr.S ;
+
+DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ]
+	: kMBR : kMBRSize ;
+
+if $(TARGET_ARCH) = "x86" || $(TARGET_ARCH) = "x86_64" {
+	Includes [ FGristFiles PartitionMapWriter.cpp ] : [ FGristFiles MBR.h ] ;
+}
+
+KernelStaticLibrary libpartitioning_systemscommon.a :
+	PartitionMap.cpp
+	PartitionMapWriter.cpp
+;
+

src/add-ons/kernel/partitioning_systems/gpt/Jamfile

@@ -4,20 +4,7 @@ UsePrivateHeaders interface kernel storage ;
 UsePrivateSystemHeaders ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src libs uuid ] ;
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) intel ] ;
-
-SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) intel ] ;
-
-# Assemble the MBR code, and convert it into a header file
-MBRFLAGS on [ FGristFiles mbr.bin ] = -DMBR_CODE_ONLY ;
-BuildMBR [ FGristFiles mbr.bin ] : mbr.S ;
-
-DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ]
-	: kMBR : kMBRSize ;
-
-if $(TARGET_ARCH) = "x86" || $(TARGET_ARCH) = "x86_64" {
-	Includes [ FGristFiles PartitionMapWriter.cpp ] : [ FGristFiles MBR.h ] ;
-}
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) common ] ;
 
 KernelAddon efi_gpt :
 	gpt.cpp
@@ -25,10 +12,8 @@ KernelAddon efi_gpt :
 	crc32.cpp
 	utility.cpp
 	PartitionLocker.cpp
-
-	# from the Intel add-on
-	PartitionMap.cpp
-	PartitionMapWriter.cpp
 	:
+	libpartitioning_systemscommon.a
 	libuuid_kernel.a
 ;
+

src/add-ons/kernel/partitioning_systems/intel/Jamfile

@@ -2,23 +2,13 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems intel ;
 
 UsePrivateHeaders kernel shared storage ;
 UsePrivateSystemHeaders ;
-
-# Assemble the MBR code, and convert it into a header file
-MBRFLAGS on [ FGristFiles mbr.bin ] = -DMBR_CODE_ONLY ;
-BuildMBR [ FGristFiles mbr.bin ] : mbr.S ;
-
-DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ]
-	: kMBR : kMBRSize ;
-
-if $(TARGET_ARCH) = "x86" || $(TARGET_ARCH) = "x86_64" {
-	Includes [ FGristFiles PartitionMapWriter.cpp ] : [ FGristFiles MBR.h ] ;
-}
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) common ] ;
 
 KernelAddon intel :
 	intel.cpp
 	PartitionLocker.cpp
-	PartitionMap.cpp
 	PartitionMapParser.cpp
-	PartitionMapWriter.cpp
 	write_support.cpp
+	:
+	libpartitioning_systemscommon.a
 ;

src/system/boot/loader/Jamfile

@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src system boot loader ;
 
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems amiga ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems apple ;
+SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems common ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ;
 UsePrivateKernelHeaders ;
@@ -148,8 +149,9 @@ for platform in [ MultiBootSubDirSetup ] {
 			utility.cpp
 
 			intel.cpp
-			PartitionMap.cpp
 			PartitionMapParser.cpp
+
+			PartitionMap.cpp
 			;
 
 		# Tell Jam where to find the utility sources
@@ -174,9 +176,12 @@ for platform in [ MultiBootSubDirSetup ] {
 		SEARCH on [ FGristFiles gpt.cpp Header.cpp crc32.cpp utility.cpp ]
 			= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ] ;
 
-		SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ]
+		SEARCH on [ FGristFiles intel.cpp PartitionMapParser.cpp ]
 			= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ;
 
+		SEARCH on [ FGristFiles PartitionMap.cpp ]
+			= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems common ] ;
+
 		SEARCH on [ FGristFiles stage2_crt0.S ]
 			= [ FDirName $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH_DIR) ] ;
 

src/tools/makebootable/platform/bios_ia32/Jamfile

@@ -21,6 +21,8 @@ if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd || $(HOST_PLATFORM) =
 		partitioning_systems intel ] ;
 	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel
 		partitioning_systems gpt ] ;
+	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel
+		partitioning_systems common ] ;
 
 	DEFINES += _USER_MODE ;
 }