From 61ba12594bf9f447b1384bda0bcd8e4b1e56e315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 23 Jan 2013 23:21:25 +0100 Subject: [PATCH] Renamed partitioning system "efi" directory to "gpt". --- src/add-ons/disk_systems/gpt/Jamfile | 2 +- src/add-ons/kernel/partitioning_systems/Jamfile | 2 +- src/add-ons/kernel/partitioning_systems/{efi => gpt}/Jamfile | 2 +- .../partitioning_systems/{efi => gpt}/PartitionLocker.cpp | 0 .../partitioning_systems/{efi => gpt}/PartitionLocker.h | 0 .../kernel/partitioning_systems/{efi => gpt}/efi_gpt.cpp | 0 .../kernel/partitioning_systems/{efi => gpt}/efi_gpt.h | 0 .../partitioning_systems/{efi => gpt}/gpt_known_guids.h | 0 src/add-ons/kernel/partitioning_systems/{efi => gpt}/guid.h | 0 src/system/boot/loader/Jamfile | 4 ++-- src/tests/system/boot/loader/Jamfile | 4 ++-- 11 files changed, 7 insertions(+), 7 deletions(-) rename src/add-ons/kernel/partitioning_systems/{efi => gpt}/Jamfile (67%) rename src/add-ons/kernel/partitioning_systems/{efi => gpt}/PartitionLocker.cpp (100%) rename src/add-ons/kernel/partitioning_systems/{efi => gpt}/PartitionLocker.h (100%) rename src/add-ons/kernel/partitioning_systems/{efi => gpt}/efi_gpt.cpp (100%) rename src/add-ons/kernel/partitioning_systems/{efi => gpt}/efi_gpt.h (100%) rename src/add-ons/kernel/partitioning_systems/{efi => gpt}/gpt_known_guids.h (100%) rename src/add-ons/kernel/partitioning_systems/{efi => gpt}/guid.h (100%) diff --git a/src/add-ons/disk_systems/gpt/Jamfile b/src/add-ons/disk_systems/gpt/Jamfile index 2c26d45985..2083ced849 100644 --- a/src/add-ons/disk_systems/gpt/Jamfile +++ b/src/add-ons/disk_systems/gpt/Jamfile @@ -4,7 +4,7 @@ UsePrivateHeaders shared storage ; UsePrivateSystemHeaders ; SEARCH_SOURCE - += [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems efi ] ; + += [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ] ; AddResources gpt : GPTDiskAddOn.rdef ; diff --git a/src/add-ons/kernel/partitioning_systems/Jamfile b/src/add-ons/kernel/partitioning_systems/Jamfile index 353620fac0..77c050c83e 100644 --- a/src/add-ons/kernel/partitioning_systems/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems ; HaikuSubInclude amiga ; HaikuSubInclude apple ; HaikuSubInclude atari ; -HaikuSubInclude efi ; +HaikuSubInclude gpt ; HaikuSubInclude intel ; HaikuSubInclude session ; HaikuSubInclude vmdk ; diff --git a/src/add-ons/kernel/partitioning_systems/efi/Jamfile b/src/add-ons/kernel/partitioning_systems/gpt/Jamfile similarity index 67% rename from src/add-ons/kernel/partitioning_systems/efi/Jamfile rename to src/add-ons/kernel/partitioning_systems/gpt/Jamfile index 431a677789..11fbc691ec 100644 --- a/src/add-ons/kernel/partitioning_systems/efi/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/gpt/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel partitioning_systems efi ; +SubDir HAIKU_TOP src add-ons kernel partitioning_systems gpt ; UsePrivateHeaders interface kernel storage ; UsePrivateSystemHeaders ; diff --git a/src/add-ons/kernel/partitioning_systems/efi/PartitionLocker.cpp b/src/add-ons/kernel/partitioning_systems/gpt/PartitionLocker.cpp similarity index 100% rename from src/add-ons/kernel/partitioning_systems/efi/PartitionLocker.cpp rename to src/add-ons/kernel/partitioning_systems/gpt/PartitionLocker.cpp diff --git a/src/add-ons/kernel/partitioning_systems/efi/PartitionLocker.h b/src/add-ons/kernel/partitioning_systems/gpt/PartitionLocker.h similarity index 100% rename from src/add-ons/kernel/partitioning_systems/efi/PartitionLocker.h rename to src/add-ons/kernel/partitioning_systems/gpt/PartitionLocker.h diff --git a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp b/src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.cpp similarity index 100% rename from src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp rename to src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.cpp diff --git a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.h b/src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.h similarity index 100% rename from src/add-ons/kernel/partitioning_systems/efi/efi_gpt.h rename to src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.h diff --git a/src/add-ons/kernel/partitioning_systems/efi/gpt_known_guids.h b/src/add-ons/kernel/partitioning_systems/gpt/gpt_known_guids.h similarity index 100% rename from src/add-ons/kernel/partitioning_systems/efi/gpt_known_guids.h rename to src/add-ons/kernel/partitioning_systems/gpt/gpt_known_guids.h diff --git a/src/add-ons/kernel/partitioning_systems/efi/guid.h b/src/add-ons/kernel/partitioning_systems/gpt/guid.h similarity index 100% rename from src/add-ons/kernel/partitioning_systems/efi/guid.h rename to src/add-ons/kernel/partitioning_systems/gpt/guid.h diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile index 089f0dedea..a7391555fd 100644 --- a/src/system/boot/loader/Jamfile +++ b/src/system/boot/loader/Jamfile @@ -2,7 +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 efi ; +SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ; UsePrivateKernelHeaders ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; @@ -115,7 +115,7 @@ SEARCH on [ FGristFiles apple.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems apple ] ; SEARCH on [ FGristFiles efi_gpt.cpp ] - = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems efi ] ; + = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ] ; SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ; diff --git a/src/tests/system/boot/loader/Jamfile b/src/tests/system/boot/loader/Jamfile index aec23cc9e7..5d9c06db71 100644 --- a/src/tests/system/boot/loader/Jamfile +++ b/src/tests/system/boot/loader/Jamfile @@ -11,7 +11,7 @@ SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ; SubDirHdrs $(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 efi ; +SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ; if $(TARGET_PLATFORM) != haiku { @@ -150,7 +150,7 @@ SEARCH on [ FGristFiles apple.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems apple ] ; SEARCH on [ FGristFiles efi_gpt.cpp ] - = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems efi ] ; + = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ] ; SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ;