From c016d92ea1d5fce8e6814210c2a6381e736197b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Tue, 15 Feb 2005 00:25:32 +0000
Subject: [PATCH] Added the new console/vga_text driver/module stuff to the old
 boot floppy 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
---
 src/kernel/Jamfile | 48 +++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/kernel/Jamfile b/src/kernel/Jamfile
index fdae80e073..d01a6a6fe4 100644
--- a/src/kernel/Jamfile
+++ b/src/kernel/Jamfile
@@ -59,9 +59,9 @@ KernelLd kernel :
 	kernel_disk_device_manager.o
 	kernel_util.o
 	kernel_messaging.o
+	kernel_debug.o
 
 	lib$(OBOS_ARCH).a
-	libdrivers.a
 
 	linkhack.so
 
@@ -85,9 +85,9 @@ KernelLd kernel.so :
 	kernel_disk_device_manager.o
 	kernel_util.o
 	kernel_messaging.o
+	kernel_debug.o
 
 	lib$(OBOS_ARCH).a
-	libdrivers.a
 
 	linkhack.so
 
@@ -312,6 +312,16 @@ KernelLd 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.
 KernelLd obos_shell :
 	libglue2.o
@@ -328,7 +338,7 @@ KernelLd obos_shell :
 	: $(SUBDIR)/ldscripts/$(OBOS_ARCH)/app.ld
 	:
 	:
-	: beos/bin/shell
+	: beos/bin/sh
 	;
 
 KernelLd testapp :
@@ -371,22 +381,20 @@ KernelLd fork_test :
 	: beos/bin/fork_test
 	;
 
-#if $(OS) = "BEOS" 
-#{
-#	KernelConfigSection addons/drivers/dev/misc/pcspeaker 
-#		: 
-#		elf32 
-#		:
-#		/boot/home/config/add-ons/kernel/drivers/bin/pcspeaker 
-#		;
+KernelConfigSection drivers/dev/tty
+	: elf32
+	: $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/drivers/dev/tty
+	;
 
-#	KernelConfigSection addons/drivers/dev/net/tulip 
-#		: 
-#		elf32 
-#		: 
-#		/boot/beos/system/add-ons/kernel/drivers/bin/tulip 
-#		;
-#}
+KernelConfigSection drivers/dev/console
+	: elf32
+	: $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/drivers/dev/console
+	;
+
+KernelConfigSection addons/kernel/console/vga_text
+	: elf32
+	: $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/console/vga_text
+	;
 
 KernelLd kernel_ps :
 	libglue2.o
@@ -427,6 +435,10 @@ KernelFloppyImage $(OBOS_FLOPPY) : $(OBOS_KERNEL) : $(SUBDIR)/boot/arch/$(OBOS_A
 Depends kernel.so : 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) ;
 NotFile boot_floppy ;
 Depends bootfloppy : $(OBOS_FLOPPY) ;