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

Added the new console/vga_text driver/module stuff to the old boot floppy

Browse Source 
method as well.
Removed libdrivers.a from the kernel, added kernel_debug.o to the kernel.
Renamed the boot floppy shell "sh", so that consoled doesn't need to be
changed.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11377 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-02-15 00:25:32 +00:00
parent 1ceb0f4da3
commit c016d92ea1
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/Jamfile
+30 -18
View File
@@ -59,9 +59,9 @@ KernelLd kernel :
kernel_disk_device_manager.o kernel_disk_device_manager.o
kernel_util.o kernel_util.o
kernel_messaging.o kernel_messaging.o
kernel_debug.o
lib$(OBOS_ARCH).a lib$(OBOS_ARCH).a
libdrivers.a
linkhack.so linkhack.so
@@ -85,9 +85,9 @@ KernelLd kernel.so :
kernel_disk_device_manager.o kernel_disk_device_manager.o
kernel_util.o kernel_util.o
kernel_messaging.o kernel_messaging.o
kernel_debug.o
lib$(OBOS_ARCH).a lib$(OBOS_ARCH).a
libdrivers.a
linkhack.so linkhack.so
@@ -312,6 +312,16 @@ KernelLd symlink :
: beos/bin/symlink : beos/bin/symlink
; ;
KernelLd <bootfloppy>consoled :
libglue2.o
<$(SOURCE_GRIST)!apps!consoled>consoled.o
libroot.so
: $(SUBDIR)/ldscripts/$(OBOS_ARCH)/app.ld
:
:
: beos/bin/consoled
;
# Note: shell is a built in target, thus we need the grist. # Note: shell is a built in target, thus we need the grist.
KernelLd obos_shell : KernelLd obos_shell :
libglue2.o libglue2.o
@@ -328,7 +338,7 @@ KernelLd obos_shell :
: $(SUBDIR)/ldscripts/$(OBOS_ARCH)/app.ld : $(SUBDIR)/ldscripts/$(OBOS_ARCH)/app.ld
: :
: :
: beos/bin/shell : beos/bin/sh
; ;
KernelLd testapp : KernelLd testapp :
@@ -371,22 +381,20 @@ KernelLd fork_test :
: beos/bin/fork_test : beos/bin/fork_test
; ;
#if $(OS) = "BEOS" KernelConfigSection drivers/dev/tty
#{ : elf32
# KernelConfigSection addons/drivers/dev/misc/pcspeaker : $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/drivers/dev/tty
# : ;
# elf32
# :
# /boot/home/config/add-ons/kernel/drivers/bin/pcspeaker
# ;
# KernelConfigSection addons/drivers/dev/net/tulip KernelConfigSection drivers/dev/console
# : : elf32
# elf32 : $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/drivers/dev/console
# : ;
# /boot/beos/system/add-ons/kernel/drivers/bin/tulip
# ; KernelConfigSection addons/kernel/console/vga_text
#} : elf32
: $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/console/vga_text
;
KernelLd kernel_ps : KernelLd kernel_ps :
libglue2.o libglue2.o
@@ -427,6 +435,10 @@ KernelFloppyImage $(OBOS_FLOPPY) : $(OBOS_KERNEL) : $(SUBDIR)/boot/arch/$(OBOS_A
Depends kernel.so : kernel ; Depends kernel.so : kernel ;
# kernel.so will be rebuilt with the kernel # kernel.so will be rebuilt with the kernel
Depends $(OBOS_FLOPPY) : tty ;
Depends $(OBOS_FLOPPY) : console ;
Depends $(OBOS_FLOPPY) : vga_text ;
Depends boot_floppy : $(OBOS_FLOPPY) ; Depends boot_floppy : $(OBOS_FLOPPY) ;
NotFile boot_floppy ; NotFile boot_floppy ;
Depends bootfloppy : $(OBOS_FLOPPY) ; Depends bootfloppy : $(OBOS_FLOPPY) ;