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

* Currently, it's always supposed to be busses/ide. All the drivers there

Browse Source 
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
This commit is contained in:
Stephan Aßmus
2009-05-08 09:53:21 +00:00
parent 35e29efeef
commit b8435574d1
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
-5
View File
@@ -165,13 +165,8 @@ AddFilesToHaikuImage system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToHaikuImage system add-ons kernel busses agp_gart AddFilesToHaikuImage system add-ons kernel busses agp_gart
: $(X86_ONLY)<agp_gart>intel ; : $(X86_ONLY)<agp_gart>intel ;
if $(HAIKU_ATA_STACK) = 1 {
AddFilesToHaikuImage system add-ons kernel busses ide AddFilesToHaikuImage system add-ons kernel busses ide
: generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ; : 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 AddFilesToHaikuImage system add-ons kernel busses scsi
: ahci ; : ahci ;
AddFilesToHaikuImage system add-ons kernel busses usb AddFilesToHaikuImage system add-ons kernel busses usb
src/add-ons/kernel/busses/Jamfile
+1 -1
View File
@@ -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! # 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 ; SubInclude HAIKU_TOP src add-ons kernel busses ata ;
} else { } else {
SubInclude HAIKU_TOP src add-ons kernel busses ide ; SubInclude HAIKU_TOP src add-ons kernel busses ide ;