From b8435574d17d4dcaea6dc66b4181f4ba9281115f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Fri, 8 May 2009 09:53:21 +0000 Subject: [PATCH] * Currently, it's always supposed to be busses/ide. All the drivers there publish themselves in busses/ide, so you cannot just move them to busses/ata without changing that in the source as well. The object files are still built in the separate busses/ata under generated. * src/system/kernel/device_manager/device_manager.cpp also hardcodes busses/ide in two places. I tried changing all of this to add busses/ata, but my system remains unbootable with the new ATA stack. I do have another system, and because of the previous mixup in HaikuImage, there it installed the drivers in busses/ide when building for the new ATA stack (by mistake), but those drivers actually publish themselves in busses/ide, so this system actually boots with the new ATA stack, because of the mixup. Therefore My change here to install into busses/ide for either stack should be correct for now and should actually fix building the *old* stack. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30671 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 11 +++-------- src/add-ons/kernel/busses/Jamfile | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 69d8a1b6c0..21a34f2776 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -40,7 +40,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 id ident ideinfo idestatus ifconfig install installsound iroster isvolume join - keymap kill less lessecho lesskey link linkcatkeys listarea listattr + keymap kill less lessecho lesskey link linkcatkeys listarea listattr listimage listdev listport listres listsem listusb ln locate logger login logname ls lsindex makebootable md5sum merge mimeset mkdos mkdir mkfifo mkfs mkindex @@ -70,7 +70,7 @@ SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProb StyledEdit Terminal TextSearch TV Workspaces ; SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail - FileTypes Fonts Keyboard Keymap Locale Media Menu Mouse Network Printers + FileTypes Fonts Keyboard Keymap Locale Media Menu Mouse Network Printers Screen ScreenSaver Sounds Time Touchpad Tracker VirtualMemory ; SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo @@ -165,13 +165,8 @@ AddFilesToHaikuImage system add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; AddFilesToHaikuImage system add-ons kernel busses agp_gart : $(X86_ONLY)intel ; -if $(HAIKU_ATA_STACK) = 1 { AddFilesToHaikuImage system add-ons kernel busses ide : generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ; -} else { -AddFilesToHaikuImage system add-ons kernel busses ata - : generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ; -} AddFilesToHaikuImage system add-ons kernel busses scsi : ahci ; AddFilesToHaikuImage system add-ons kernel busses usb @@ -293,7 +288,7 @@ AddDirectoryToHaikuImage home config be Preferences ; # TODO/NOTE: Cannot use $(SYSTEM_PREFERENCES) here since there is # "Tracker"... DESKBAR_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations - E-mail FileTypes Fonts Keyboard Keymap Locale Media Menu Mouse Network + E-mail FileTypes Fonts Keyboard Keymap Locale Media Menu Mouse Network Printers Screen ScreenSaver Sounds Time Touchpad Tracker VirtualMemory ; for linkTarget in $(DESKBAR_PREFERENCES) { diff --git a/src/add-ons/kernel/busses/Jamfile b/src/add-ons/kernel/busses/Jamfile index 006690d842..9e290c6d44 100644 --- a/src/add-ons/kernel/busses/Jamfile +++ b/src/add-ons/kernel/busses/Jamfile @@ -1,7 +1,7 @@ -SubDir HAIKU_TOP src add-ons kernel busses ; +SubDir HAIKU_TOP src add-ons kernel busses ; # HACK: remove this when the old ide code is removed! -if $(HAIKU_ATA_STACK) { +if $(HAIKU_ATA_STACK) = 1 { SubInclude HAIKU_TOP src add-ons kernel busses ata ; } else { SubInclude HAIKU_TOP src add-ons kernel busses ide ;