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

Since objects/.../system/kernel is now a directory, the kernel target is now

Browse Source 
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
This commit is contained in:
Axel Dörfler
2005-04-13 14:49:55 +00:00
parent 4ce3301a57
commit 900849fa0d
12 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makehdimage
+5 -5
View File
@@ -291,7 +291,7 @@ done
# kernel # kernel
echo "Installing 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 # libs
@@ -302,8 +302,8 @@ for f in $BEOS_SYSTEM_LIB; do
$cp ${sPrefix}$f $targetDir/beos/system/lib/ $cp ${sPrefix}$f $targetDir/beos/system/lib/
done done
cd $sourceDir/objects/${arch}.R1/kernel/ cd $sourceDir/objects/${arch}.R1/system/
$scd ${sPrefix}$sourceDir/objects/${arch}.R1/kernel/ $scd ${sPrefix}$sourceDir/objects/${arch}.R1/system/
$cp ${sPrefix}runtime_loader/rld.so ${sPrefix}libroot.so $targetDir/beos/system/lib/ $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 # boot loader
echo "Installing boot loader..." echo "Installing boot loader..."
cd $sourceDir/objects/${arch}.R1/kernel/ cd $sourceDir/objects/${arch}.R1/system/
rm -f zbeos rm -f zbeos
objcopy -O binary boot_loader zbeos objcopy -O binary boot_loader zbeos
$cd $targetDir/beos/system $cd $targetDir/beos/system
$cp ${sPrefix}$sourceDir/objects/${arch}.R1/kernel/zbeos . $cp ${sPrefix}$sourceDir/objects/${arch}.R1/system/zbeos .
# boot module links # boot module links
src/add-ons/kernel/bus_managers/config_manager/Jamfile
+1 -1
View File
@@ -12,7 +12,7 @@ KernelLd
<$(SOURCE_GRIST)>config_manager.o <$(SOURCE_GRIST)>config_manager.o
kernel.so kernel.so
: :
$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/add-on.ld
: :
-Bdynamic -shared -Bdynamic -shared
: :
src/add-ons/kernel/bus_managers/pci/Jamfile
+1 -1
View File
@@ -13,7 +13,7 @@ KernelAddon pci : kernel bus_managers :
SEARCH on [ FGristFiles SEARCH on [ FGristFiles
kernel_cpp.cpp 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 # pci_info.cpp currently needs pcihdr.h so we make its path available
ObjectHdrs [ FGristFiles pci_info$(SUFOBJ) ] ObjectHdrs [ FGristFiles pci_info$(SUFOBJ) ]
src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile
+1 -1
View File
@@ -16,7 +16,7 @@ KernelLd keyboard :
<$(SOURCE_GRIST)>keyboard.o <$(SOURCE_GRIST)>keyboard.o
kernel.so kernel.so
: :
$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld $(OBOS_TOP)/src/system/ldscripts/$(OBOS_ARCH)/add-on.ld
: :
-Bdynamic -shared -Bdynamic -shared
: :
src/add-ons/kernel/file_systems/bfs/Jamfile
+1 -1
View File
@@ -50,7 +50,7 @@ KernelAddon bfs : kernel file_systems :
SEARCH on [ FGristFiles SEARCH on [ FGristFiles
kernel_cpp.cpp kernel_cpp.cpp
] = [ FDirName $(OBOS_TOP) src kernel core util ] ; ] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
# restore original optimization level # restore original optimization level
OPTIM = $(oldOPTIM) ; OPTIM = $(oldOPTIM) ;
src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
+2 -2
View File
@@ -36,5 +36,5 @@ R5KernelStaticLibrary kernelppp :
_KPPPPFCHandler.cpp _KPPPPFCHandler.cpp
; ;
SEARCH on [ FGristFiles kernel_cpp.cpp ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; SEARCH on [ FGristFiles kernel_cpp.cpp ] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
SEARCH on [ FGristFiles Locker.cpp ] = [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ; SEARCH on [ FGristFiles Locker.cpp ] = [ FDirName $(OBOS_TOP) src system kernel disk_device_manager ] ;
src/add-ons/kernel/network/ppp/shared/libppp/Jamfile
+2 -2
View File
@@ -18,7 +18,7 @@ StaticLibrary ppp :
PPPManager.cpp PPPManager.cpp
; ;
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 ] ;
SEARCH on [ FGristFiles settings_tools.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; 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 ] ; SEARCH on [ FGristFiles KPPPUtils.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ;
src/kits/Jamfile
+2 -2
View File
@@ -97,10 +97,10 @@ Includes <boot!home!config!lib>libopenbeos.so
SEARCH on [ FGristFiles SEARCH on [ FGristFiles
strlcat.c strlcpy.c 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 ] 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 app ;
SubInclude OBOS_TOP src kits debug ; SubInclude OBOS_TOP src kits debug ;
src/kits/network/libbind/Jamfile
+3 -2
View File
@@ -4,8 +4,8 @@ UsePrivateHeaders net ;
UseHeaders [ FDirName $(SUBDIR) headers ] ; UseHeaders [ FDirName $(SUBDIR) headers ] ;
# our libroot contains functions that are missing in BeOS (e.g.: strlcat) # 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 system libroot posix pthread ] ;
SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
# private sources for this port # private sources for this port
SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
@@ -168,6 +168,7 @@ SharedLibrary "bind" :
res_update.c res_update.c
# functions from our libroot # functions from our libroot
# ToDo: these can be removed for the Haiku build
pthread_mutex.c pthread_mutex.c
pthread_mutexattr.c pthread_mutexattr.c
strlcat.c strlcat.c
src/servers/syslog_daemon/Jamfile
+2 -1
View File
@@ -10,6 +10,7 @@ Server syslog_daemon :
listener_output.cpp listener_output.cpp
# that's for a successful build on R5 # that's for a successful build on R5
# ToDo: this can be removed for the Haiku build
strlcpy.c strlcpy.c
; ;
@@ -17,4 +18,4 @@ LinkSharedOSLibs syslog_daemon : be ;
SEARCH on [ FGristFiles SEARCH on [ FGristFiles
strlcpy.c strlcpy.c
] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
src/system/Jamfile
+3 -1
View File
@@ -50,7 +50,7 @@ KernelLd stage2 :
: bootstrap : bootstrap
; ;
KernelLd kernel : KernelLd kernel_$(OBOS_ARCH) :
kernel_core.o kernel_core.o
kernel_fs.o kernel_fs.o
kernel_vm.o kernel_vm.o
@@ -178,6 +178,8 @@ KernelLd libglue2.o : # libglue2.o is used for executables
WriteKernelConfig $(OBOS_KERNEL_CONFIG) ; WriteKernelConfig $(OBOS_KERNEL_CONFIG) ;
BuildKernel $(OBOS_KERNEL) : $(OBOS_KERNEL_CONFIG) ; BuildKernel $(OBOS_KERNEL) : $(OBOS_KERNEL_CONFIG) ;
NotFile kernel ;
Depends kernel : kernel_$(OBOS_ARCH) ;
Depends kernel.so : kernel ; Depends kernel.so : kernel ;
# kernel.so will be rebuilt with the kernel # kernel.so will be rebuilt with the kernel
src/tools/gensyscalls/Jamfile
+4 -4
View File
@@ -42,10 +42,10 @@ UseArchObjectHeaders gensyscalls.cpp : $(OBOS_ARCH) ;
# generate the output files # generate the output files
# place them where there are needed # place them where there are needed
MakeLocate <syscalls>syscalls.S.inc : [ FObjectsDir src kernel libroot os ] ; MakeLocate <syscalls>syscalls.S.inc : [ FObjectsDir src system libroot os ] ;
MakeLocate <syscalls>syscall_dispatcher.h : [ FObjectsDir src kernel core ] ; MakeLocate <syscalls>syscall_dispatcher.h : [ FObjectsDir src system kernel ] ;
MakeLocate <syscalls>syscall_numbers.h : [ FObjectsDir src kernel core ] ; MakeLocate <syscalls>syscall_numbers.h : [ FObjectsDir src system kernel ] ;
MakeLocate <syscalls>syscall_table.h : [ FObjectsDir src kernel core ] ; MakeLocate <syscalls>syscall_table.h : [ FObjectsDir src system kernel ] ;
MakeLocate <syscalls>strace_syscalls.h : [ FObjectsDir src bin strace ] ; MakeLocate <syscalls>strace_syscalls.h : [ FObjectsDir src bin strace ] ;
Depends <dir>objects/x86.R1/kernel/core : <dir>objects/x86.R1/kernel ; Depends <dir>objects/x86.R1/kernel/core : <dir>objects/x86.R1/kernel ;