From 3a5624e900c27c58b5e2a78a3a7790036244a42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 11 May 2005 02:03:18 +0000 Subject: [PATCH] Replaced the strange BEOS_ADD_ONS_BUSMASTERS with BEOS_ADD_ONS_BUS_MANAGERS and BEOS_ADD_ONS_KERNEL_MISC. Added PCI IDE modules to the build and boot links. The config_manager can now be handled like every other bus manager. The config_manager appeared twice in the jam argument list. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12629 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- makehdimage | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/makehdimage b/makehdimage index 56337a335d..d5a913b279 100755 --- a/makehdimage +++ b/makehdimage @@ -128,19 +128,20 @@ BEOS_ADD_ONS_ACCELERANTS="radeon.accelerant nv.accelerant mga.accelerant \ BEOS_ADD_ONS_TRANSLATORS="STXTTranslator RTF-Translator" BEOS_ADD_ONS_MEDIA="mixer.media_addon legacy.media_addon multi_audio.media_addon" BEOS_ADD_ONS_INPUT_DEVICES="keyboard mouse" -BEOS_ADD_ONS_DRIVERS_MISC="config_manager blkman fast_log ide_adapter locked_pool \ - scsi_periph intel keyboard scsi_dsk scsi_cd dprintf null zero random ps2_hid tty \ - console config vga_text" +BEOS_ADD_ONS_DRIVERS_MISC="keyboard scsi_dsk scsi_cd dprintf null zero random ps2_hid \ + tty console config" BEOS_ADD_ONS_DRIVERS_GRAPHICS="radeon.driver nv.driver nm.driver mga.driver" BEOS_ADD_ONS_DRIVERS_NET="ipro1000 rtl8139 rtl8169 sis900 \ via-rhine wb840 net_stack_driver" # bcm440x bcm570x (only available with GPLd add-ons) -BEOS_ADD_ONS_BUSMASTERS="pci isa ide scsi ide_isa" +BEOS_ADD_ONS_BUS_MANAGERS="pci isa ide scsi config_manager" +BEOS_ADD_ONS_KERNEL_MISC="ide_isa generic_ide_pci blkman fast_log ide_adapter locked_pool \ + scsi_periph intel keyboard vga_text" BEOS_ADD_ONS_FILESYSTEMS="bfs" BEOS_DATA_FILES="timezone_files keymap_files" echo "Building executables and libraries..." -jam -j$(sysinfo -cpu | head -c 2) -q rc resattr kernel boot_loader config_manager \ +jam -j$(sysinfo -cpu | head -c 2) -q rc resattr kernel boot_loader \ rld.so kernel_fortune consoled \route \ $BEOS_BIN \ $BEOS_APPS \ @@ -153,7 +154,8 @@ jam -j$(sysinfo -cpu | head -c 2) -q rc resattr kernel boot_loader config_manage $BEOS_ADD_ONS_DRIVERS_MISC \ $BEOS_ADD_ONS_DRIVERS_GRAPHICS \ $BEOS_ADD_ONS_DRIVERS_NET \ - $BEOS_ADD_ONS_BUSMASTERS \ + $BEOS_ADD_ONS_BUS_MANAGERS \ + $BEOS_ADD_ONS_KERNEL_MISC \ $BEOS_ADD_ONS_FILESYSTEMS \ $BEOS_ADD_ONS_ACCELERANTS \ $BEOS_ADD_ONS_TRANSLATORS \ @@ -246,10 +248,13 @@ echo "Installing kernel modules..." cd $sourceDir/distro/${arch}.R1/beos/system/add-ons/kernel $scd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/system/add-ons/kernel -for f in bus_managers/isa bus_managers/ide bus_managers/scsi busses/ide/ide_isa \ - file_systems/bfs generic/blkman generic/fast_log generic/ide_adapter \ - generic/locked_pool generic/scsi_periph partitioning_systems/intel \ - console/vga_text bus_managers/pci; do +for f in $BEOS_ADD_ONS_BUS_MANAGERS; do + $cp ${sPrefix}bus_managers/$f $targetDir/beos/system/add-ons/kernel/bus_managers/$f +done + +for f in busses/ide/ide_isa file_systems/bfs generic/blkman generic/fast_log \ + generic/ide_adapter generic/locked_pool generic/scsi_periph \ + partitioning_systems/intel console/vga_text busses/ide/generic_ide_pci; do $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/$f done @@ -261,12 +266,6 @@ done cd $sourceDir/objects/${arch}.R1/add-ons/kernel $scd ${sPrefix}$sourceDir/objects/${arch}.R1/add-ons/kernel -for f in bus_managers/config_manager; do - name=$(basename $f) - $cp ${sPrefix}$f/$name $targetDir/beos/system/add-ons/kernel/$f -done - - # drivers for f in drivers/arch/${arch}/keyboard/keyboard; do $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin @@ -370,7 +369,10 @@ $cp ${sPrefix}$sourceDir/objects/${arch}.R1/system/zbeos . # boot module links echo "Creating boot module links..." $cd $targetDir/beos/system/add-ons/kernel/boot -for f in bus_managers/config_manager bus_managers/pci bus_managers/isa bus_managers/ide bus_managers/scsi busses/ide/ide_isa file_systems/bfs generic/blkman generic/fast_log generic/ide_adapter generic/locked_pool generic/scsi_periph partitioning_systems/intel; do +for f in bus_managers/config_manager bus_managers/pci bus_managers/isa bus_managers/ide \ + bus_managers/scsi busses/ide/ide_isa file_systems/bfs generic/blkman \ + generic/fast_log generic/ide_adapter generic/locked_pool generic/scsi_periph \ + partitioning_systems/intel busses/ide/generic_ide_pci; do $ln -fs /boot/beos/system/add-ons/kernel/$f $(basename $f) done for f in drivers/dev/disk/scsi/scsi_dsk drivers/dev/disk/scsi/scsi_cd; do