This should fix the build after all the kernel/system renaming.

If anything is still broken (and was not before :)), please shout.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12361 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/Jamfile

@@ -4,10 +4,10 @@ SubInclude OBOS_TOP src add-ons ;
 SubInclude OBOS_TOP src apps ;
 SubInclude OBOS_TOP src bin ;
 SubInclude OBOS_TOP src data ;
-SubInclude OBOS_TOP src kernel ;
 SubInclude OBOS_TOP src kits ;
 SubInclude OBOS_TOP src libs ;
 SubInclude OBOS_TOP src prefs ;
 SubInclude OBOS_TOP src servers ;
+SubInclude OBOS_TOP src system ;
 SubInclude OBOS_TOP src tests ;
 SubInclude OBOS_TOP src tools ;

src/system/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel ;
+SubDir OBOS_TOP src system ;
 
 KernelLd boot_loader :
 	boot_platform_$(OBOS_BOOT_PLATFORM).o
@@ -181,8 +181,8 @@ BuildKernel $(OBOS_KERNEL) : $(OBOS_KERNEL_CONFIG) ;
 Depends kernel.so : kernel ;
 	# kernel.so will be rebuilt with the kernel
 
-SubInclude OBOS_TOP src kernel boot ;
+SubInclude OBOS_TOP src system boot ;
-SubInclude OBOS_TOP src kernel core ;
+SubInclude OBOS_TOP src system kernel ;
-SubInclude OBOS_TOP src kernel glue ;
+SubInclude OBOS_TOP src system glue ;
-SubInclude OBOS_TOP src kernel libroot ;
+SubInclude OBOS_TOP src system libroot ;
-SubInclude OBOS_TOP src kernel runtime_loader ;
+SubInclude OBOS_TOP src system runtime_loader ;

src/system/boot/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel boot ;
+SubDir OBOS_TOP src system boot ;
 
 #SetupIncludes ; 
 #oldccflags = $(CCFLAGS) ;
@@ -19,6 +19,6 @@ BuildPlatformMain makeflop : makeflop.c ;
 
 #CCFLAGS = $(oldccflags) ;
 
-SubInclude OBOS_TOP src kernel boot arch ;
+SubInclude OBOS_TOP src system boot arch ;
-SubInclude OBOS_TOP src kernel boot platform ;
+SubInclude OBOS_TOP src system boot platform ;
-SubInclude OBOS_TOP src kernel boot loader ;
+SubInclude OBOS_TOP src system boot loader ;

src/system/boot/arch/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel boot arch ;
+SubDir OBOS_TOP src system boot arch ;
 
-SubInclude OBOS_TOP src kernel boot arch $(OBOS_ARCH) ;
+SubInclude OBOS_TOP src system boot arch $(OBOS_ARCH) ;

src/system/boot/arch/alpha/Jamfile

@@ -1,2 +1,2 @@
-SubDir OBOS_TOP src kernel boot arch alpha ;
+SubDir OBOS_TOP src system boot arch alpha ;
 

src/system/boot/arch/m68k/Jamfile

@@ -1,2 +1,2 @@
-SubDir OBOS_TOP src kernel boot arch m68k ;
+SubDir OBOS_TOP src system boot arch m68k ;
 

src/system/boot/arch/mips/Jamfile

@@ -1,2 +1,2 @@
-SubDir OBOS_TOP src kernel boot arch mips ;
+SubDir OBOS_TOP src system boot arch mips ;
 

src/system/boot/arch/ppc/Jamfile

@@ -1,2 +1,2 @@
-SubDir OBOS_TOP src kernel boot arch ppc ;
+SubDir OBOS_TOP src system boot arch ppc ;
 

src/system/boot/arch/sh4/Jamfile

@@ -1,2 +1,2 @@
-SubDir OBOS_TOP src kernel boot arch sh4 ;
+SubDir OBOS_TOP src system boot arch sh4 ;
 

src/system/boot/arch/sparc/Jamfile

@@ -1,2 +1,2 @@
-SubDir OBOS_TOP src kernel boot arch sparc ;
+SubDir OBOS_TOP src system boot arch sparc ;
 

src/system/boot/arch/sparc64/Jamfile

@@ -1,2 +1,2 @@
-SubDir OBOS_TOP src kernel boot arch sparc64 ;
+SubDir OBOS_TOP src system boot arch sparc64 ;
 

src/system/boot/arch/x86/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel boot arch x86 ;
+SubDir OBOS_TOP src system boot arch x86 ;
 
 KernelMergeObject boot_arch_stage2.o :
 	<$(SOURCE_GRIST)>stage2.c 

src/system/boot/loader/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel boot loader ;
+SubDir OBOS_TOP src system boot loader ;
 
 # SubDirHdrs $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ;
 UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
@@ -62,10 +62,10 @@ KernelStaticLibrary boot_partitions :
 
 # Tell Jam where to find the utility sources
 SEARCH on [ FGristFiles kernel_cpp.cpp list.c ]
-    = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+    = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 SEARCH on [ FGristFiles driver_settings.c ]
-    = [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
+    = [ FDirName $(OBOS_TOP) src system libroot os ] ;
 
 SEARCH on [ FGristFiles amiga_rdb.cpp ]
     = [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ] ;
@@ -77,7 +77,7 @@ SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ]
     = [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems intel ] ;
 
 SEARCH on [ FGristFiles stage2_crt0.S ]
-    = [ FDirName $(OBOS_TOP) src kernel boot arch $(OBOS_ARCH) ] ;
+    = [ FDirName $(OBOS_TOP) src system boot arch $(OBOS_ARCH) ] ;
 
 
-SubInclude OBOS_TOP src kernel boot loader file_systems ;
+SubInclude OBOS_TOP src system boot loader file_systems ;

src/system/boot/loader/file_systems/Jamfile

@@ -1,5 +1,5 @@
-SubDir OBOS_TOP src kernel boot loader file_systems ;
+SubDir OBOS_TOP src system boot loader file_systems ;
 
-SubInclude OBOS_TOP src kernel boot loader file_systems bfs ;
+SubInclude OBOS_TOP src system boot loader file_systems bfs ;
-SubInclude OBOS_TOP src kernel boot loader file_systems hfs_plus ;
+SubInclude OBOS_TOP src system boot loader file_systems hfs_plus ;
-SubInclude OBOS_TOP src kernel boot loader file_systems amiga_ffs ;
+SubInclude OBOS_TOP src system boot loader file_systems amiga_ffs ;

src/system/boot/loader/file_systems/amiga_ffs/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel boot loader file_systems amiga_ffs ;
+SubDir OBOS_TOP src system boot loader file_systems amiga_ffs ;
 
 UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;

src/system/boot/loader/file_systems/bfs/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel boot loader file_systems bfs ;
+SubDir OBOS_TOP src system boot loader file_systems bfs ;
 
 UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;

src/system/boot/loader/file_systems/hfs_plus/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel boot loader file_systems hfs_plus ;
+SubDir OBOS_TOP src system boot loader file_systems hfs_plus ;
 
 UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;

src/system/boot/platform/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel boot platform ;
+SubDir OBOS_TOP src system boot platform ;
 
-SubInclude OBOS_TOP src kernel boot platform $(OBOS_BOOT_PLATFORM) ;
+SubInclude OBOS_TOP src system boot platform $(OBOS_BOOT_PLATFORM) ;

src/system/boot/platform/bios_ia32/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel boot platform bios_ia32 ;
+SubDir OBOS_TOP src system boot platform bios_ia32 ;
 
 SubDirHdrs $(OBOS_TOP) headers private kernel boot platform $(OBOS_BOOT_PLATFORM) ;
 

src/system/boot/platform/openfirmware/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel boot platform openfirmware ;
+SubDir OBOS_TOP src system boot platform openfirmware ;
 
 SubDirC++Flags -fno-rtti ;
 
@@ -18,6 +18,6 @@ KernelMergeObject boot_platform_openfirmware.o :
 	;
 
 SEARCH on [ FGristFiles crt0.S ]
-    = [ FDirName $(OBOS_TOP) src kernel boot arch $(OBOS_ARCH) ] ;
+    = [ FDirName $(OBOS_TOP) src system boot arch $(OBOS_ARCH) ] ;
 
-SubInclude OBOS_TOP src kernel boot platform openfirmware arch ;
+SubInclude OBOS_TOP src system boot platform openfirmware arch ;

src/system/boot/platform/openfirmware/arch/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel boot platform openfirmware arch ;
+SubDir OBOS_TOP src system boot platform openfirmware arch ;
 
-SubInclude OBOS_TOP src kernel boot platform openfirmware arch $(OBOS_ARCH) ;
+SubInclude OBOS_TOP src system boot platform openfirmware arch $(OBOS_ARCH) ;

src/system/boot/platform/openfirmware/arch/ppc/Jamfile

@@ -1,6 +1,6 @@
-SubDir OBOS_TOP src kernel boot platform openfirmware arch ppc ;
+SubDir OBOS_TOP src system boot platform openfirmware arch ppc ;
 
-SubDirHdrs $(OBOS_TOP) src kernel boot platform $(OBOS_BOOT_PLATFORM) ;
+SubDirHdrs $(OBOS_TOP) src system boot platform $(OBOS_BOOT_PLATFORM) ;
 
 SubDirC++Flags -fno-rtti ;
 
@@ -12,4 +12,4 @@ KernelStaticLibrary boot_platform_openfirmware_ppc :
 	;
 
 SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ]
-    = [ FDirName $(OBOS_TOP) src kernel core arch $(OBOS_ARCH) ] ;
+    = [ FDirName $(OBOS_TOP) src system kernel arch $(OBOS_ARCH) ] ;

src/system/glue/Jamfile

@@ -1,8 +1,8 @@
-SubDir OBOS_TOP src kernel glue ;
+SubDir OBOS_TOP src system glue ;
 
 KernelObjects
 	init_term_dyn.c
 	start_dyn.c
 	;
 
-SubInclude OBOS_TOP src kernel glue arch ;
+SubInclude OBOS_TOP src system glue arch ;

src/system/glue/arch/Jamfile

@@ -1 +1 @@
-SubInclude OBOS_TOP src kernel glue arch $(OBOS_ARCH) ;
+SubInclude OBOS_TOP src system glue arch $(OBOS_ARCH) ;

src/system/glue/arch/ppc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel glue arch ppc ;
+SubDir OBOS_TOP src system glue arch ppc ;
 
 KernelObjects
 	crti.S

src/system/glue/arch/x86/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel glue arch x86 ;
+SubDir OBOS_TOP src system glue arch x86 ;
 
 KernelObjects
 	crti.S

src/system/kernel/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core ;
+SubDir OBOS_TOP src system kernel ;
 
 local buildSources = ;
 if $(OS) != BEOS {
@@ -58,12 +58,12 @@ KernelLd linkhack.so :
 	-shared -Bdynamic
 	;
 
-SubInclude OBOS_TOP src kernel core arch ;
+SubInclude OBOS_TOP src system kernel arch ;
-SubInclude OBOS_TOP src kernel core cache ;
+SubInclude OBOS_TOP src system kernel cache ;
-SubInclude OBOS_TOP src kernel core device_manager ;
+SubInclude OBOS_TOP src system kernel device_manager ;
-SubInclude OBOS_TOP src kernel core debug ;
+SubInclude OBOS_TOP src system kernel debug ;
-SubInclude OBOS_TOP src kernel core disk_device_manager ;
+SubInclude OBOS_TOP src system kernel disk_device_manager ;
-SubInclude OBOS_TOP src kernel core fs ;
+SubInclude OBOS_TOP src system kernel fs ;
-SubInclude OBOS_TOP src kernel core messaging ;
+SubInclude OBOS_TOP src system kernel messaging ;
-SubInclude OBOS_TOP src kernel core util ;
+SubInclude OBOS_TOP src system kernel util ;
-SubInclude OBOS_TOP src kernel core vm ;
+SubInclude OBOS_TOP src system kernel vm ;

src/system/kernel/arch/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel core arch ;
+SubDir OBOS_TOP src system kernel arch ;
 
-SubInclude OBOS_TOP src kernel core arch $(OBOS_ARCH) ;
+SubInclude OBOS_TOP src system kernel arch $(OBOS_ARCH) ;

src/system/kernel/arch/ppc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core arch ppc ;
+SubDir OBOS_TOP src system kernel arch ppc ;
 
 KernelStaticLibrary libppc :
 	arch_atomic.c

src/system/kernel/arch/x86/Jamfile

@@ -1,7 +1,7 @@
-SubDir OBOS_TOP src kernel core arch x86 ;
+SubDir OBOS_TOP src system kernel arch x86 ;
 
 # for syscall_numbers.h
-SubDirHdrs [ FObjectsDir src kernel core ] ;
+SubDirHdrs [ FObjectsDir src system kernel ] ;
 
 KernelStaticLibrary libx86 :
 	arch_cpu.c

src/system/kernel/cache/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core cache ;
+SubDir OBOS_TOP src system kernel cache ;
 
 KernelMergeObject kernel_cache.o :
 	block_cache.cpp

src/system/kernel/debug/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core debug ;
+SubDir OBOS_TOP src system kernel debug ;
 
 UsePrivateHeaders [ FDirName kernel debug ] ;
 

src/system/kernel/device_manager/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core device_manager ;
+SubDir OBOS_TOP src system kernel device_manager ;
 
 UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;

src/system/kernel/disk_device_manager/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core disk_device_manager ;
+SubDir OBOS_TOP src system kernel disk_device_manager ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) jobs ] ;
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kits storage ] ;

src/system/kernel/fs/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core fs ;
+SubDir OBOS_TOP src system kernel fs ;
 
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName kernel fs ] ;

src/system/kernel/messaging/Jamfile

@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src kernel core messaging ;
+SubDir OBOS_TOP src system kernel messaging ;
 
 UsePrivateHeaders [ FDirName kernel ] ;
 #UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 #UsePrivateHeaders [ FDirName kernel fs ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;	# for <KMessage.h>
 UsePrivateHeaders shared ;
-UseHeaders [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
+UseHeaders [ FDirName $(OBOS_TOP) src system kernel disk_device_manager ] ;
 	# for "Locker.h"
 
 KernelMergeObject kernel_messaging.o :

src/system/kernel/util/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core util ;
+SubDir OBOS_TOP src system kernel util ;
 
 UsePrivateHeaders [ FDirName kernel util ] ;
 

src/system/kernel/vm/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel core vm ;
+SubDir OBOS_TOP src system kernel vm ;
 
 KernelMergeObject kernel_vm.o :
 	vm.c

src/system/libroot/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot ;
+SubDir OBOS_TOP src system libroot ;
 
 UsePrivateHeaders libroot ;
 
@@ -21,7 +21,7 @@ KernelMergeObject kernel_os_main.o :
 
 SEARCH on [ FGristFiles
 		driver_settings.c fs_info.c
-	] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
+	] = [ FDirName $(OBOS_TOP) src system libroot os ] ;
 
 # kernel libroot posix files
 
@@ -115,5 +115,5 @@ KernelMergeObject kernel_posix.o :
 	: -fno-pic
 	;
 
-SubInclude OBOS_TOP src kernel libroot os ;
+SubInclude OBOS_TOP src system libroot os ;
-SubInclude OBOS_TOP src kernel libroot posix ;
+SubInclude OBOS_TOP src system libroot posix ;

src/system/libroot/os/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot os ;
+SubDir OBOS_TOP src system libroot os ;
 
 SubDirHdrs [ FCurrentObjectsDir ] ;
 
@@ -30,4 +30,4 @@ KernelMergeObject os_main.o :
 # We need to specify the dependency on the generated syscalls file explicitly.
 Depends [ FGristFiles syscalls.o ] : <syscalls>syscalls.S.inc ;
 
-SubInclude OBOS_TOP src kernel libroot os arch ;
+SubInclude OBOS_TOP src system libroot os arch ;

src/system/libroot/os/arch/Jamfile

@@ -1 +1 @@
-SubInclude OBOS_TOP src kernel libroot os arch $(OBOS_ARCH) ;
+SubInclude OBOS_TOP src system libroot os arch $(OBOS_ARCH) ;

src/system/libroot/os/arch/ppc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot os arch ppc ;
+SubDir OBOS_TOP src system libroot os arch ppc ;
 
 KernelMergeObject os_arch_$(OBOS_ARCH).o :
 	<$(SOURCE_GRIST)>atomic.S

src/system/libroot/os/arch/x86/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot os arch x86 ;
+SubDir OBOS_TOP src system libroot os arch x86 ;
 
 KernelMergeObject os_arch_$(OBOS_ARCH).o :
 	atomic.S

src/system/libroot/posix/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix ;
+SubDir OBOS_TOP src system libroot posix ;
 
 UsePrivateHeaders [ FDirName syslog_daemon ] ;
 
@@ -19,18 +19,18 @@ KernelMergeObject posix_main.o :
  	: -fPIC -DPIC
 	;
 
-SubInclude OBOS_TOP src kernel libroot posix arch ;
+SubInclude OBOS_TOP src system libroot posix arch ;
 
-SubInclude OBOS_TOP src kernel libroot posix locale ;
+SubInclude OBOS_TOP src system libroot posix locale ;
-SubInclude OBOS_TOP src kernel libroot posix malloc ;
+SubInclude OBOS_TOP src system libroot posix malloc ;
-SubInclude OBOS_TOP src kernel libroot posix math ;
+SubInclude OBOS_TOP src system libroot posix math ;
-SubInclude OBOS_TOP src kernel libroot posix pthread ;
+SubInclude OBOS_TOP src system libroot posix pthread ;
-SubInclude OBOS_TOP src kernel libroot posix signal ;
+SubInclude OBOS_TOP src system libroot posix signal ;
-SubInclude OBOS_TOP src kernel libroot posix stdio ;
+SubInclude OBOS_TOP src system libroot posix stdio ;
-SubInclude OBOS_TOP src kernel libroot posix stdlib ;
+SubInclude OBOS_TOP src system libroot posix stdlib ;
-SubInclude OBOS_TOP src kernel libroot posix string ;
+SubInclude OBOS_TOP src system libroot posix string ;
-SubInclude OBOS_TOP src kernel libroot posix sys ;
+SubInclude OBOS_TOP src system libroot posix sys ;
-SubInclude OBOS_TOP src kernel libroot posix time ;
+SubInclude OBOS_TOP src system libroot posix time ;
-SubInclude OBOS_TOP src kernel libroot posix unistd ;
+SubInclude OBOS_TOP src system libroot posix unistd ;
 
-SubInclude OBOS_TOP src kernel libroot posix glibc ;
+SubInclude OBOS_TOP src system libroot posix glibc ;

src/system/libroot/posix/arch/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel libroot posix arch ;
+SubDir OBOS_TOP src system libroot posix arch ;
 
-SubInclude OBOS_TOP src kernel libroot posix arch $(OBOS_ARCH) ;
+SubInclude OBOS_TOP src system libroot posix arch $(OBOS_ARCH) ;

src/system/libroot/posix/arch/ppc/Jamfile

@@ -1 +1 @@
-SubDir OBOS_TOP src kernel libroot posix arch ppc ;
+SubDir OBOS_TOP src system libroot posix arch ppc ;

src/system/libroot/posix/arch/x86/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix arch x86 ;
+SubDir OBOS_TOP src system libroot posix arch x86 ;
 
 KernelMergeObject posix_arch_$(OBOS_ARCH).o :
 	setjmp.c

src/system/libroot/posix/glibc/Jamfile

@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src kernel libroot posix glibc ;
+SubDir OBOS_TOP src system libroot posix glibc ;
 
-SubInclude OBOS_TOP src kernel libroot posix glibc arch ;
+SubInclude OBOS_TOP src system libroot posix glibc arch ;
-SubInclude OBOS_TOP src kernel libroot posix glibc ctype ;
+SubInclude OBOS_TOP src system libroot posix glibc ctype ;
-SubInclude OBOS_TOP src kernel libroot posix glibc extensions ;
+SubInclude OBOS_TOP src system libroot posix glibc extensions ;
-SubInclude OBOS_TOP src kernel libroot posix glibc locale ;
+SubInclude OBOS_TOP src system libroot posix glibc locale ;
-SubInclude OBOS_TOP src kernel libroot posix glibc libio ;
+SubInclude OBOS_TOP src system libroot posix glibc libio ;
-SubInclude OBOS_TOP src kernel libroot posix glibc regex ;
+SubInclude OBOS_TOP src system libroot posix glibc regex ;
-SubInclude OBOS_TOP src kernel libroot posix glibc stdio-common ;
+SubInclude OBOS_TOP src system libroot posix glibc stdio-common ;
-SubInclude OBOS_TOP src kernel libroot posix glibc stdlib ;
+SubInclude OBOS_TOP src system libroot posix glibc stdlib ;
-SubInclude OBOS_TOP src kernel libroot posix glibc wcsmbs ;
+SubInclude OBOS_TOP src system libroot posix glibc wcsmbs ;

src/system/libroot/posix/glibc/arch/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix glibc arch ;
+SubDir OBOS_TOP src system libroot posix glibc arch ;
 
-SubInclude OBOS_TOP src kernel libroot posix glibc arch $(OBOS_ARCH) ;
+SubInclude OBOS_TOP src system libroot posix glibc arch $(OBOS_ARCH) ;
 

src/system/libroot/posix/glibc/arch/ppc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix arch x86 ;
+SubDir OBOS_TOP src system libroot posix arch x86 ;
 
 KernelMergeObject posix_arch_$(OBOS_ARCH).o :
 	setjmp.c

src/system/libroot/posix/glibc/arch/x86/Jamfile

@@ -1,9 +1,9 @@
-SubDir OBOS_TOP src kernel libroot posix glibc arch x86 ;
+SubDir OBOS_TOP src system libroot posix glibc arch x86 ;
 
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc stdlib ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc stdlib ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ;
 
 KernelMergeObject posix_gnu_arch_$(OBOS_ARCH).o :
 	add_n.S
@@ -24,4 +24,4 @@ KernelMergeObject posix_gnu_arch_$(OBOS_ARCH).o :
 
 SEARCH on [ FGristFiles
 	cmp.c divrem.c mul.c mul_n.c dbl2mpn.c
-        ] = [ FDirName $(OBOS_TOP) src kernel libroot posix glibc arch ] ;
+        ] = [ FDirName $(OBOS_TOP) src system libroot posix glibc arch ] ;

src/system/libroot/posix/glibc/ctype/Jamfile

@@ -1,9 +1,9 @@
-SubDir OBOS_TOP src kernel libroot posix glibc ctype ;
+SubDir OBOS_TOP src system libroot posix glibc ctype ;
 
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ;
 
 KernelMergeObject posix_gnu_ctype.o :
 	ctype-info.c

src/system/libroot/posix/glibc/extensions/Jamfile

@@ -1,10 +1,10 @@
-SubDir OBOS_TOP src kernel libroot posix glibc extensions ;
+SubDir OBOS_TOP src system libroot posix glibc extensions ;
 
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc libio ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc libio ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ;
 
 KernelMergeObject posix_gnu_ext.o :
 	getopt.c

src/system/libroot/posix/glibc/libio/Jamfile

@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src kernel libroot posix glibc libio ;
+SubDir OBOS_TOP src system libroot posix glibc libio ;
 
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ;
-#SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc stdio-common ;
+#SubDirHdrs $(OBOS_TOP) src system libroot posix glibc stdio-common ;
-#SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc libio ;
+#SubDirHdrs $(OBOS_TOP) src system libroot posix glibc libio ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ;
 
 # For now, all wide character functions are disabled,
 # obprintf() is also disabled, because we don't have

src/system/libroot/posix/glibc/locale/Jamfile

@@ -1,9 +1,9 @@
-SubDir OBOS_TOP src kernel libroot posix glibc locale ;
+SubDir OBOS_TOP src system libroot posix glibc locale ;
 
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ;
 
 KernelMergeObject posix_gnu_locale.o :
 	C-ctype.c

src/system/libroot/posix/glibc/regex/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix glibc regex ;
+SubDir OBOS_TOP src system libroot posix glibc regex ;
 
 SubDirHdrs $(OBOS_TOP) headers ;
 

src/system/libroot/posix/glibc/stdio-common/Jamfile

@@ -1,13 +1,13 @@
-SubDir OBOS_TOP src kernel libroot posix glibc stdio-common ;
+SubDir OBOS_TOP src system libroot posix glibc stdio-common ;
 
 SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO ;
 
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc libio ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc libio ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc stdio-common ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc stdio-common ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ;
 
 # ToDo: for now, all wide character functions are disabled
 

src/system/libroot/posix/glibc/stdlib/Jamfile

@@ -1,6 +1,6 @@
-SubDir OBOS_TOP src kernel libroot posix glibc stdlib ;
+SubDir OBOS_TOP src system libroot posix glibc stdlib ;
 
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ;
 
 KernelMergeObject posix_gnu_stdlib.o :
 	fpioconst.c

src/system/libroot/posix/glibc/wcsmbs/Jamfile

@@ -1,12 +1,12 @@
-SubDir OBOS_TOP src kernel libroot posix glibc wcsmbs ;
+SubDir OBOS_TOP src system libroot posix glibc wcsmbs ;
 
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include arch $(OBOS_ARCH) ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include arch $(OBOS_ARCH) ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc include ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc include ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc libio ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc libio ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc wcsmbs ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc wcsmbs ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc iconv ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc iconv ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc locale ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc locale ;
-SubDirHdrs $(OBOS_TOP) src kernel libroot posix glibc ;
+SubDirHdrs $(OBOS_TOP) src system libroot posix glibc ;
 
 # ToDo: for now, all wide character functions are disabled
 

src/system/libroot/posix/locale/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix locale ;
+SubDir OBOS_TOP src system libroot posix locale ;
 
 KernelMergeObject posix_locale.o :
 	#ctype.c

src/system/libroot/posix/malloc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix malloc ;
+SubDir OBOS_TOP src system libroot posix malloc ;
 
 KernelMergeObject posix_malloc.o :
 	arch-specific.cpp 

src/system/libroot/posix/math/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix math ;
+SubDir OBOS_TOP src system libroot posix math ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) glibc ] ;
 
@@ -41,4 +41,4 @@ KernelMergeObject posix_math.o :
 	-fPIC -DPIC
 	;
 
-SubInclude OBOS_TOP src kernel libroot posix math arch ;  
+SubInclude OBOS_TOP src system libroot posix math arch ;  

src/system/libroot/posix/math/arch/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel libroot posix math arch ;
+SubDir OBOS_TOP src system libroot posix math arch ;
 
-SubInclude OBOS_TOP src kernel libroot posix math arch $(OBOS_ARCH) ;
+SubInclude OBOS_TOP src system libroot posix math arch $(OBOS_ARCH) ;

src/system/libroot/posix/math/arch/ppc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix math arch ppc ;
+SubDir OBOS_TOP src system libroot posix math arch ppc ;
 
 KernelMergeObject posix_math_arch_$(OBOS_ARCH).o :
 	<$(SOURCE_GRIST)>fabs.c

src/system/libroot/posix/math/arch/sh4/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel libroot posix math arch sh4 ;
+SubDir OBOS_TOP src system libroot posix math arch sh4 ;
 
 KernelStaticLibrary libmsh4 : fabs.S frexp.c isinf.c ldexp.c ;

src/system/libroot/posix/math/arch/x86/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix math arch x86 ;
+SubDir OBOS_TOP src system libroot posix math arch x86 ;
 
 KernelMergeObject posix_math_arch_$(OBOS_ARCH).o :
 	<$(SOURCE_GRIST)>fabs.S

src/system/libroot/posix/pthread/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix pthread ;
+SubDir OBOS_TOP src system libroot posix pthread ;
 
 UsePrivateHeaders libroot ;
 

src/system/libroot/posix/signal/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix signal ;
+SubDir OBOS_TOP src system libroot posix signal ;
 
 KernelMergeObject posix_signal.o :
 	kill.c

src/system/libroot/posix/stdio/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix stdio ;
+SubDir OBOS_TOP src system libroot posix stdio ;
 
 KernelMergeObject posix_stdio.o :
 	<$(SOURCE_GRIST)>remove.c

src/system/libroot/posix/stdlib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix stdlib ;
+SubDir OBOS_TOP src system libroot posix stdlib ;
 
 UsePrivateHeaders libroot ;
 

src/system/libroot/posix/string/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix string ;
+SubDir OBOS_TOP src system libroot posix string ;
 
 KernelMergeObject posix_string.o :
 	bcmp.c

src/system/libroot/posix/sys/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix sys ;
+SubDir OBOS_TOP src system libroot posix sys ;
 
 KernelMergeObject posix_sys.o :
 	chmod.c

src/system/libroot/posix/time/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix time ;
+SubDir OBOS_TOP src system libroot posix time ;
 
 # for localtime.c strftime.c
 SubDirCcFlags -DNOID -DTZDIR='\"/etc/timezones\"' -DUSG_COMPAT -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DPCTS=1 ;

src/system/libroot/posix/unistd/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel libroot posix unistd ;
+SubDir OBOS_TOP src system libroot posix unistd ;
 
 KernelMergeObject posix_unistd.o :
 	access.c

src/system/runtime_loader/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel runtime_loader ;
+SubDir OBOS_TOP src system runtime_loader ;
 
 KernelObjects 
 	rld.c
@@ -10,40 +10,40 @@ KernelObjects
 
 KernelStaticLibraryObjects librld.a :
 	# needed for rld.so only
-	<src!kernel!libroot!os>syscalls.o
+	<src!system!libroot!os>syscalls.o
-	<src!kernel!libroot!os>sem.o
+	<src!system!libroot!os>sem.o
-	<src!kernel!libroot!os!arch!$(OBOS_ARCH)>atomic.o
+	<src!system!libroot!os!arch!$(OBOS_ARCH)>atomic.o
 
-	<src!kernel!libroot!posix>errno.o
+	<src!system!libroot!posix>errno.o
 
- 	<src!kernel!libroot!posix!glibc!ctype>ctype-info.o
+ 	<src!system!libroot!posix!glibc!ctype>ctype-info.o
-	<src!kernel!libroot!posix!glibc!locale>C-ctype.o
+	<src!system!libroot!posix!glibc!locale>C-ctype.o
-	<src!kernel!libroot!posix!glibc!locale>C_name.o
+	<src!system!libroot!posix!glibc!locale>C_name.o
-  	<src!kernel!libroot>kernel_vsprintf.o
+  	<src!system!libroot>kernel_vsprintf.o
-  	<src!kernel!libroot!posix!unistd>open.o
+  	<src!system!libroot!posix!unistd>open.o
 
-	<src!kernel!libroot!posix!string>memchr.o
+	<src!system!libroot!posix!string>memchr.o
-	<src!kernel!libroot!posix!string>memcmp.o
+	<src!system!libroot!posix!string>memcmp.o
-	<src!kernel!libroot!posix!string>memcpy.o
+	<src!system!libroot!posix!string>memcpy.o
-	<src!kernel!libroot!posix!string>memmove.o
+	<src!system!libroot!posix!string>memmove.o
-	<src!kernel!libroot!posix!string>memset.o
+	<src!system!libroot!posix!string>memset.o
-	<src!kernel!libroot!posix!string>strcasecmp.o
+	<src!system!libroot!posix!string>strcasecmp.o
-	<src!kernel!libroot!posix!string>strcat.o
+	<src!system!libroot!posix!string>strcat.o
-	<src!kernel!libroot!posix!string>strchr.o
+	<src!system!libroot!posix!string>strchr.o
-	<src!kernel!libroot!posix!string>strcmp.o
+	<src!system!libroot!posix!string>strcmp.o
-	<src!kernel!libroot!posix!string>strcpy.o
+	<src!system!libroot!posix!string>strcpy.o
-	<src!kernel!libroot!posix!string>strcspn.o
+	<src!system!libroot!posix!string>strcspn.o
-	<src!kernel!libroot!posix!string>strdup.o
+	<src!system!libroot!posix!string>strdup.o
-	<src!kernel!libroot!posix!string>strerror.o
+	<src!system!libroot!posix!string>strerror.o
-	<src!kernel!libroot!posix!string>strlcat.o
+	<src!system!libroot!posix!string>strlcat.o
-	<src!kernel!libroot!posix!string>strlcpy.o
+	<src!system!libroot!posix!string>strlcpy.o
-	<src!kernel!libroot!posix!string>strlen.o
+	<src!system!libroot!posix!string>strlen.o
-	<src!kernel!libroot!posix!string>strncmp.o
+	<src!system!libroot!posix!string>strncmp.o
-	<src!kernel!libroot!posix!string>strnlen.o
+	<src!system!libroot!posix!string>strnlen.o
-	<src!kernel!libroot!posix!string>strpbrk.o
+	<src!system!libroot!posix!string>strpbrk.o
-	<src!kernel!libroot!posix!string>strrchr.o
+	<src!system!libroot!posix!string>strrchr.o
-	<src!kernel!libroot!posix!string>strspn.o
+	<src!system!libroot!posix!string>strspn.o
-	<src!kernel!libroot!posix!string>strstr.o
+	<src!system!libroot!posix!string>strstr.o
 	;
 
 KernelLd rld.so :

src/tests/add-ons/kernel/Jamfile

@@ -18,15 +18,15 @@ AbsSymLink <boot!home!config!lib>libkernelland_emu.so : libkernelland_emu.so
 
 SEARCH on [ FGristFiles 
 		strlcpy.c
-	] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ;
+	] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
 
 SEARCH on [ FGristFiles 
 		lock.c
-	] = [ FDirName $(OBOS_TOP) src kernel core ] ;
+	] = [ FDirName $(OBOS_TOP) src system kernel ] ;
 
 SEARCH on [ FGristFiles
 		list.c
-	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+	] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 # SubInclude OBOS_TOP src tests add-ons kernel disk_scanner ;
 SubInclude OBOS_TOP src tests add-ons kernel drivers ;

src/tests/add-ons/kernel/disk_scanner/Jamfile

@@ -4,7 +4,7 @@ SubDir OBOS_TOP src tests add-ons kernel disk_scanner ;
 #
 # the test app
 #
-#SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
+#SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot os ] ;
 #SimpleTest DiskScannerTest : DiskScannerTest.cpp
 #	: <boot!home!config!lib>libkernelland_emu.so be stdc++.r4 ;
 #LOCATE on <installed>DiskScannerTest = [ on DiskScannerTest return $(LOCATE) ] ;

src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile

@@ -54,4 +54,4 @@ SEARCH on [ FGristFiles
 
 SEARCH on [ FGristFiles
 		kernel_cpp.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+	] = [ FDirName $(OBOS_TOP) src system kernel util ] ;

src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile

@@ -58,7 +58,7 @@ R5KernelAddon $(bfsAddOnName)_r5 : kernel file_systems :
 
 SEARCH on [ FGristFiles
 		kernel_cpp.cpp 
-	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+	] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 #-----------------------------------------------------
 

src/tests/add-ons/kernel/network/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 # the network stack tester app
 
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot os ] ;
 
 SimpleTest net_stack_tester : 
 	net_stack_tester.cpp 

src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile

@@ -32,5 +32,5 @@ StaticLibrary <userland>kernelppp :
 	driver_settings.c
 ;
 
-SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ;
+SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
-SEARCH on [ FGristFiles driver_settings.c ] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
+SEARCH on [ FGristFiles driver_settings.c ] = [ FDirName $(OBOS_TOP) src system libroot os ] ;

src/tests/kernel/boot/heap/Jamfile

@@ -27,5 +27,5 @@ BuildPlatformTest heapTest :
 # Tell Jam where to find the utility sources
 SEARCH on [ FGristFiles 
 		heap.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ;
+	] = [ FDirName $(OBOS_TOP) src system boot loader ] ;
 

src/tests/kernel/boot/loader/Jamfile

@@ -5,7 +5,7 @@ UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 UsePrivateHeaders [ FDirName shared ] ;
 SubDirHdrs $(OBOS_TOP) headers private kernel arch $(OBOS_ARCH) ;
-SubDirHdrs $(OBOS_TOP) src kernel boot loader ;
+SubDirHdrs $(OBOS_TOP) src system boot loader ;
 
 # we need to redefine certain calls in the boot loader so that
 # they will really be used instead of their POSIX counterparts
@@ -102,20 +102,20 @@ SimpleTest BootLoaderTest :
 # Tell Jam where to find the utility sources
 
 SEARCH on [ FGristFiles list.c ]
-	= [ FDirName $(OBOS_TOP) src kernel core util ] ;
+	= [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 SEARCH on [ FGristFiles strlcat.c strlcpy.c ]
-	= [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ;
+	= [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
 
 SEARCH on [ FGristFiles driver_settings.c ]
-	= [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
+	= [ FDirName $(OBOS_TOP) src system libroot os ] ;
 
 SEARCH on [ FGristFiles 
 		main.cpp vfs.cpp partitions.cpp
 		heap.cpp RootFileSystem.cpp
 		elf.cpp menu.cpp loader.cpp
 		kernel_args.cpp load_driver_settings.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ;
+	] = [ FDirName $(OBOS_TOP) src system boot loader ] ;
 
 # partitioning system modules
 

src/tests/kernel/boot/loader/file_systems/amiga_ffs/Jamfile

@@ -26,4 +26,4 @@ KernelStaticLibrary boottest_amiga_ffs :
 
 SEARCH on [ FGristFiles
 		amiga_ffs.cpp Volume.cpp Directory.cpp File.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel boot loader file_systems amiga_ffs ] ;
+	] = [ FDirName $(OBOS_TOP) src system boot loader file_systems amiga_ffs ] ;

src/tests/kernel/boot/loader/file_systems/bfs/Jamfile

@@ -31,5 +31,5 @@ KernelStaticLibrary boottest_bfs.a :
 
 SEARCH on [ FGristFiles
 		bfs.cpp Directory.cpp File.cpp Link.cpp Stream.cpp BPlusTree.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel boot loader file_systems bfs ] ;
+	] = [ FDirName $(OBOS_TOP) src system boot loader file_systems bfs ] ;
 

src/tests/kernel/boot_floppy/Jamfile

@@ -23,7 +23,7 @@ KernelLd init :
 	libglue2.o
 	<$(SOURCE_GRIST)>init.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/init
@@ -33,7 +33,7 @@ KernelLd kernel_false :
 	libglue2.o
 	<$(SOURCE_GRIST)>false_main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/false
@@ -43,7 +43,7 @@ KernelLd kernel_true :
 	libglue2.o
 	<$(SOURCE_GRIST)>true_main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/true
@@ -53,7 +53,7 @@ KernelLd fibo :
 	libglue2.o
 	<$(SOURCE_GRIST)>fibo_main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/fibo
@@ -63,7 +63,7 @@ KernelLd sig_test :
 	libglue2.o
 	<$(SOURCE_GRIST)>sig_test.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/sig_test
@@ -73,7 +73,7 @@ KernelLd monitor_test :
 	libglue2.o
 	<$(SOURCE_GRIST)>monitor_test.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/monitor_test
@@ -83,7 +83,7 @@ KernelLd kernel_fortune :
 	libglue2.o
 	<$(SOURCE_GRIST)!fortune>main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/fortune
@@ -95,7 +95,7 @@ KernelLd kernel_ls :
 	libglue2.o
 	<$(SOURCE_GRIST)!ls>main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/ls
@@ -105,7 +105,7 @@ KernelLd kernel_ln :
 	libglue2.o
 	<$(SOURCE_GRIST)!symlink>main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/symlink
@@ -115,7 +115,7 @@ KernelLd boot_floppy_consoled :
 	libglue2.o
 	<src!tests!kernel!consoled>consoled.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/consoled
@@ -134,7 +134,7 @@ KernelLd obos_shell :
 	<$(SOURCE_GRIST)!shell>statements.o
 	<$(SOURCE_GRIST)!shell>shell_history.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/sh
@@ -144,7 +144,7 @@ KernelLd kernel_testapp :
 	libglue2.o
 	<$(SOURCE_GRIST)!testapp>main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/testapp
@@ -154,7 +154,7 @@ KernelLd tls_test :
 	libglue2.o
 	<$(SOURCE_GRIST)>tls_test.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/tls_test
@@ -164,7 +164,7 @@ KernelLd pipe_test :
 	libglue2.o
 	<$(SOURCE_GRIST)>pipe_test.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/pipe_test
@@ -174,7 +174,7 @@ KernelLd fork_test :
 	libglue2.o
 	<$(SOURCE_GRIST)>fork_test.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/fork_test
@@ -199,7 +199,7 @@ KernelLd kernel_ps :
 	libglue2.o
 	<$(SOURCE_GRIST)!ps>main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/ps
@@ -209,7 +209,7 @@ KernelLd kernel_echo :
 	libglue2.o
 	<$(SOURCE_GRIST)!echo>main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/echo
@@ -219,13 +219,16 @@ KernelLd kernel_uname :
 	libglue2.o
 	<$(SOURCE_GRIST)!uname>main.o
 	libroot.so
-	: $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	: $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	: beos/bin/uname
 	;
 
-KernelFloppyImage $(OBOS_FLOPPY) : $(OBOS_KERNEL) : $(OBOS_TOP)/src/kernel/boot/arch/$(OBOS_ARCH)/bootblock.bin ;
+KernelFloppyImage $(OBOS_FLOPPY)
+	: $(OBOS_KERNEL)
+	: $(OBOS_TOP)/src/system/boot/arch/$(OBOS_ARCH)/bootblock.bin
+	;
 
 Depends $(OBOS_FLOPPY) : tty ;
 Depends $(OBOS_FLOPPY) : console ;

src/tests/kernel/boot_floppy/cpuinfo/Jamfile

@@ -11,7 +11,7 @@ KernelLd cpuinfo :
 	<$(SOURCE_GRIST)>main.o
 	libroot.so
 	:
-	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	$(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	:

src/tests/kernel/boot_floppy/sockettest/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel apps sockettest ;
+SubDir OBOS_TOP src system apps sockettest ;
 
 KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;

src/tests/kernel/boot_floppy/testdigit/Jamfile

@@ -1,3 +1,3 @@
-SubDir OBOS_TOP src kernel apps testdigit ;
+SubDir OBOS_TOP src system apps testdigit ;
 
 KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;

src/tests/kernel/boot_floppy/tests/Jamfile

@@ -13,7 +13,7 @@ KernelLd thread_test :
 	<$(SOURCE_GRIST)>thread_test.o
 	libroot.so
 	:
-	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	$(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	:
@@ -25,7 +25,7 @@ KernelLd fops_test :
 	<$(SOURCE_GRIST)>fops_test.o
 	libroot.so
 	:
-	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	$(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	:
@@ -37,7 +37,7 @@ KernelLd random_test :
 	<$(SOURCE_GRIST)>random_test.o
 	libroot.so
 	:
-	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld
+	$(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
 	:

src/tests/kernel/core/cache/Jamfile

@@ -1,12 +1,12 @@
 SubDir OBOS_TOP src tests kernel core cache ;
 
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core cache ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel cache ] ;
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core util ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 UsePrivateHeaders kernel ;
 UsePrivateHeaders [ FDirName kernel arch $(OBOS_ARCH) ] ;
 UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
-UseHeaders [ FDirName $(OBOS_TOP) src kernel core cache ] ;
+UseHeaders [ FDirName $(OBOS_TOP) src system kernel cache ] ;
 
 StdBinCommands
 	cache_control.cpp

src/tests/kernel/core/disk_device_manager/Jamfile

@@ -1,8 +1,8 @@
 SubDir OBOS_TOP src tests kernel core disk_device_manager ;
 
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager jobs ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel disk_device_manager jobs ] ;
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel disk_device_manager ] ;
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core fs ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system kernel fs ] ;
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kits storage ] ;
 	# DiskDeviceTypes.cpp
 
@@ -16,7 +16,7 @@ UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;
 UsePrivateHeaders storage ;
 UsePrivateHeaders kernel ;
-UseHeaders [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
+UseHeaders [ FDirName $(OBOS_TOP) src system kernel disk_device_manager ] ;
 
 # As long as we compile for R5 userland, we define the following macros.
 SubDirCcFlags	[ FDefines USER R5_MEMORY_LAYOUT ] ;

src/tests/kernel/libroot/os/Jamfile

@@ -17,4 +17,4 @@ SimpleTest FindDirectoryTest
 SEARCH on [ FGristFiles
 		driver_settings.c
 		parsedate.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
+	] = [ FDirName $(OBOS_TOP) src system libroot os ] ;

src/tests/kernel/libroot/posix/Jamfile

@@ -15,6 +15,6 @@ SimpleTest flock_test
 # Tell Jam where to find these sources
 SEARCH on [ FGristFiles
 		syslog.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel libroot posix ] ;
+	] = [ FDirName $(OBOS_TOP) src system libroot posix ] ;
 
 SubInclude OBOS_TOP src tests kernel libroot posix bonnie ;

src/tests/kernel/vm2/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel vm2 tests ;
+SubDir OBOS_TOP src system vm2 tests ;
 
 UseHeaders .. ;
 BinCommand vmTest  : test.C : root be libvm.so ;