From 900849fa0dbc41731df2958c4670042786f7afc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 13 Apr 2005 14:49:55 +0000 Subject: [PATCH] Since objects/.../system/kernel is now a directory, the kernel target is now called kernel_${arch} like on disk. A "jam kernel" will still work, though. Also updated all those Jamfiles I forgot to update before. Since makehdimage now runs through (and even builds a working image), I guess most of the consequences of the "kernel/core" -> "system/kernel" rename task are solved. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12364 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- makehdimage | 10 +++++----- src/add-ons/kernel/bus_managers/config_manager/Jamfile | 2 +- src/add-ons/kernel/bus_managers/pci/Jamfile | 2 +- src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile | 2 +- src/add-ons/kernel/file_systems/bfs/Jamfile | 2 +- .../kernel/network/ppp/shared/libkernelppp/Jamfile | 4 ++-- src/add-ons/kernel/network/ppp/shared/libppp/Jamfile | 4 ++-- src/kits/Jamfile | 4 ++-- src/kits/network/libbind/Jamfile | 5 +++-- src/servers/syslog_daemon/Jamfile | 3 ++- src/system/Jamfile | 4 +++- src/tools/gensyscalls/Jamfile | 8 ++++---- 12 files changed, 27 insertions(+), 23 deletions(-) diff --git a/makehdimage b/makehdimage index 1c63bbfd40..d84cc43ba3 100755 --- a/makehdimage +++ b/makehdimage @@ -291,7 +291,7 @@ done # kernel echo "Installing kernel..." -$cp ${sPrefix}$sourceDir/objects/${arch}.R1/kernel/kernel $targetDir/beos/system/kernel_${arch} +$cp ${sPrefix}$sourceDir/objects/${arch}.R1/system/kernel_${arch} $targetDir/beos/system/ # libs @@ -302,8 +302,8 @@ for f in $BEOS_SYSTEM_LIB; do $cp ${sPrefix}$f $targetDir/beos/system/lib/ done -cd $sourceDir/objects/${arch}.R1/kernel/ -$scd ${sPrefix}$sourceDir/objects/${arch}.R1/kernel/ +cd $sourceDir/objects/${arch}.R1/system/ +$scd ${sPrefix}$sourceDir/objects/${arch}.R1/system/ $cp ${sPrefix}runtime_loader/rld.so ${sPrefix}libroot.so $targetDir/beos/system/lib/ @@ -358,11 +358,11 @@ $cp ${sPrefix}distro/${arch}.R1/beos/etc/Keymap/US-International \ # boot loader echo "Installing boot loader..." -cd $sourceDir/objects/${arch}.R1/kernel/ +cd $sourceDir/objects/${arch}.R1/system/ rm -f zbeos objcopy -O binary boot_loader zbeos $cd $targetDir/beos/system -$cp ${sPrefix}$sourceDir/objects/${arch}.R1/kernel/zbeos . +$cp ${sPrefix}$sourceDir/objects/${arch}.R1/system/zbeos . # boot module links diff --git a/src/add-ons/kernel/bus_managers/config_manager/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/Jamfile index 666854451b..77987eb2e3 100644 --- a/src/add-ons/kernel/bus_managers/config_manager/Jamfile +++ b/src/add-ons/kernel/bus_managers/config_manager/Jamfile @@ -12,7 +12,7 @@ KernelLd <$(SOURCE_GRIST)>config_manager.o kernel.so : - $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld + $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/add-on.ld : -Bdynamic -shared : diff --git a/src/add-ons/kernel/bus_managers/pci/Jamfile b/src/add-ons/kernel/bus_managers/pci/Jamfile index b7fdf02659..7f476db5e8 100644 --- a/src/add-ons/kernel/bus_managers/pci/Jamfile +++ b/src/add-ons/kernel/bus_managers/pci/Jamfile @@ -13,7 +13,7 @@ KernelAddon pci : kernel bus_managers : SEARCH on [ FGristFiles kernel_cpp.cpp - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; # pci_info.cpp currently needs pcihdr.h so we make its path available ObjectHdrs [ FGristFiles pci_info$(SUFOBJ) ] diff --git a/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile b/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile index f8d28916df..8792fde238 100644 --- a/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile +++ b/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile @@ -16,7 +16,7 @@ KernelLd keyboard : <$(SOURCE_GRIST)>keyboard.o kernel.so : - $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld + $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/add-on.ld : -Bdynamic -shared : diff --git a/src/add-ons/kernel/file_systems/bfs/Jamfile b/src/add-ons/kernel/file_systems/bfs/Jamfile index 7466e1fe20..54d1e1eb37 100644 --- a/src/add-ons/kernel/file_systems/bfs/Jamfile +++ b/src/add-ons/kernel/file_systems/bfs/Jamfile @@ -50,7 +50,7 @@ KernelAddon bfs : kernel file_systems : SEARCH on [ FGristFiles kernel_cpp.cpp - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; # restore original optimization level OPTIM = $(oldOPTIM) ; diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile b/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile index 495aa82fea..5995f6d984 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile @@ -36,5 +36,5 @@ R5KernelStaticLibrary kernelppp : _KPPPPFCHandler.cpp ; -SEARCH on [ FGristFiles kernel_cpp.cpp ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; -SEARCH on [ FGristFiles Locker.cpp ] = [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ; +SEARCH on [ FGristFiles kernel_cpp.cpp ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; +SEARCH on [ FGristFiles Locker.cpp ] = [ FDirName $(OBOS_TOP) src system kernel disk_device_manager ] ; diff --git a/src/add-ons/kernel/network/ppp/shared/libppp/Jamfile b/src/add-ons/kernel/network/ppp/shared/libppp/Jamfile index 8b893c4e90..4a07f41f48 100644 --- a/src/add-ons/kernel/network/ppp/shared/libppp/Jamfile +++ b/src/add-ons/kernel/network/ppp/shared/libppp/Jamfile @@ -18,7 +18,7 @@ StaticLibrary ppp : PPPManager.cpp ; -SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; -SEARCH on [ FGristFiles driver_settings.c ] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ; +SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ; +SEARCH on [ FGristFiles driver_settings.c ] = [ FDirName $(OBOS_TOP) src system libroot os ] ; SEARCH on [ FGristFiles settings_tools.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; SEARCH on [ FGristFiles KPPPUtils.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; diff --git a/src/kits/Jamfile b/src/kits/Jamfile index 26912ad2ae..b16c60c09c 100644 --- a/src/kits/Jamfile +++ b/src/kits/Jamfile @@ -97,10 +97,10 @@ Includes libopenbeos.so 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 KMessage.cpp ] - = [ FDirName $(OBOS_TOP) src kernel core messaging ] ; + = [ FDirName $(OBOS_TOP) src system kernel messaging ] ; SubInclude OBOS_TOP src kits app ; SubInclude OBOS_TOP src kits debug ; diff --git a/src/kits/network/libbind/Jamfile b/src/kits/network/libbind/Jamfile index db63370329..2b1c877de6 100644 --- a/src/kits/network/libbind/Jamfile +++ b/src/kits/network/libbind/Jamfile @@ -4,8 +4,8 @@ UsePrivateHeaders net ; UseHeaders [ FDirName $(SUBDIR) headers ] ; # our libroot contains functions that are missing in BeOS (e.g.: strlcat) -SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot posix pthread ] ; -SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; +SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot posix pthread ] ; +SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot posix string ] ; # private sources for this port SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ; @@ -168,6 +168,7 @@ SharedLibrary "bind" : res_update.c # functions from our libroot + # ToDo: these can be removed for the Haiku build pthread_mutex.c pthread_mutexattr.c strlcat.c diff --git a/src/servers/syslog_daemon/Jamfile b/src/servers/syslog_daemon/Jamfile index 0b1a51060d..30d6c63177 100644 --- a/src/servers/syslog_daemon/Jamfile +++ b/src/servers/syslog_daemon/Jamfile @@ -10,6 +10,7 @@ Server syslog_daemon : listener_output.cpp # that's for a successful build on R5 + # ToDo: this can be removed for the Haiku build strlcpy.c ; @@ -17,4 +18,4 @@ LinkSharedOSLibs syslog_daemon : be ; SEARCH on [ FGristFiles strlcpy.c - ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; + ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ; diff --git a/src/system/Jamfile b/src/system/Jamfile index 0f7714f636..6a027d2fd5 100644 --- a/src/system/Jamfile +++ b/src/system/Jamfile @@ -50,7 +50,7 @@ KernelLd stage2 : : bootstrap ; -KernelLd kernel : +KernelLd kernel_$(OBOS_ARCH) : kernel_core.o kernel_fs.o kernel_vm.o @@ -178,6 +178,8 @@ KernelLd libglue2.o : # libglue2.o is used for executables WriteKernelConfig $(OBOS_KERNEL_CONFIG) ; BuildKernel $(OBOS_KERNEL) : $(OBOS_KERNEL_CONFIG) ; +NotFile kernel ; +Depends kernel : kernel_$(OBOS_ARCH) ; Depends kernel.so : kernel ; # kernel.so will be rebuilt with the kernel diff --git a/src/tools/gensyscalls/Jamfile b/src/tools/gensyscalls/Jamfile index 104055ea68..59f4879727 100644 --- a/src/tools/gensyscalls/Jamfile +++ b/src/tools/gensyscalls/Jamfile @@ -42,10 +42,10 @@ UseArchObjectHeaders gensyscalls.cpp : $(OBOS_ARCH) ; # generate the output files # place them where there are needed -MakeLocate syscalls.S.inc : [ FObjectsDir src kernel libroot os ] ; -MakeLocate syscall_dispatcher.h : [ FObjectsDir src kernel core ] ; -MakeLocate syscall_numbers.h : [ FObjectsDir src kernel core ] ; -MakeLocate syscall_table.h : [ FObjectsDir src kernel core ] ; +MakeLocate syscalls.S.inc : [ FObjectsDir src system libroot os ] ; +MakeLocate syscall_dispatcher.h : [ FObjectsDir src system kernel ] ; +MakeLocate syscall_numbers.h : [ FObjectsDir src system kernel ] ; +MakeLocate syscall_table.h : [ FObjectsDir src system kernel ] ; MakeLocate strace_syscalls.h : [ FObjectsDir src bin strace ] ; Depends objects/x86.R1/kernel/core : objects/x86.R1/kernel ;