Update bootstrap image/package

Should have been part of the recent merge.
This commit is contained in:
Ingo Weinhold
2013-07-15 16:34:41 +02:00
parent 03d70b4e58
commit ebb857698e
2 changed files with 7 additions and 3 deletions
+3 -2
View File
@@ -35,7 +35,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
setversion setvolume seq sha1sum sha256sum shar shred shuf shutdown sleep setversion setvolume seq sha1sum sha256sum shar shred shuf shutdown sleep
sort split stat strace stty su sum sync sysinfo sort split stat strace stty su sum sync sysinfo
tac tail tcpdump tcptester tee telnet telnetd test timeout top touch tac tail tcpdump tcptester tee telnet telnetd test timeout top touch
tput tr traceroute trash true truncate tsort tty tr traceroute trash true truncate tsort tty
uname unchop unexpand unmount uniq unlink unshar unzip unzipsfx uname unchop unexpand unmount uniq unlink unshar unzip unzipsfx
<bin>updatedb uptime urlwrapper useradd uudecode uuencode <bin>updatedb uptime urlwrapper useradd uudecode uuencode
vdir version vmstat vdir version vmstat
@@ -46,7 +46,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
SYSTEM_APPS = [ FFilterByBuildFeatures SYSTEM_APPS = [ FFilterByBuildFeatures
AboutSystem ActivityMonitor BootManager@x86 CharacterMap AboutSystem ActivityMonitor BootManager@x86 CharacterMap
DeskCalc Devices DiskProbe DiskUsage DriveSetup Debugger DeskCalc Debugger Devices DiskProbe DiskUsage DriveSetup
Expander Installer LaunchBox Expander Installer LaunchBox
NetworkStatus PackageInstaller NetworkStatus PackageInstaller
PowerStatus ProcessController ShowImage PowerStatus ProcessController ShowImage
@@ -146,6 +146,7 @@ SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ;
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
ata@ata pci ps2@x86,x86_64 isa@x86,x86_64 ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86 ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86
virtio
] ; ] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs exfat ext2 fat iso9660 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs exfat ext2 fat iso9660
attribute_overlay write_overlay ntfs packagefs reiserfs@x86 udf ; attribute_overlay write_overlay ntfs packagefs reiserfs@x86 udf ;
+4 -1
View File
@@ -33,8 +33,9 @@ if $(HAIKU_ATA_STACK) = 1 {
: generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ; : generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ;
} }
AddFilesToPackage add-ons kernel busses scsi : ahci ; AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ;
AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci ; AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci ;
AddFilesToPackage add-ons kernel busses virtio : virtio_pci ;
AddFilesToPackage add-ons kernel console : vga_text ; AddFilesToPackage add-ons kernel console : vga_text ;
AddFilesToPackage add-ons kernel debugger AddFilesToPackage add-ons kernel debugger
: <kdebug>demangle <kdebug>disasm@x86 <kdebug>hangman : <kdebug>demangle <kdebug>disasm@x86 <kdebug>hangman
@@ -54,6 +55,7 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
# drivers # drivers
AddNewDriversToPackage disk scsi : scsi_cd scsi_disk ; AddNewDriversToPackage disk scsi : scsi_cd scsi_disk ;
AddNewDriversToPackage disk virtual : virtio_block ;
AddNewDriversToPackage power : enhanced_speedstep@x86 ; AddNewDriversToPackage power : enhanced_speedstep@x86 ;
AddNewDriversToPackage power : acpi_battery@x86 ; AddNewDriversToPackage power : acpi_battery@x86 ;
#AddNewDriversToPackage display : display_controls@x86 ; #AddNewDriversToPackage display : display_controls@x86 ;
@@ -216,6 +218,7 @@ AddBootModuleSymlinksToPackage
ide_isa@x86 ide_isa@x86
<usb>uhci <usb>ohci <usb>ehci <usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk usb_disk scsi_cd scsi_disk usb_disk
virtio virtio_pci virtio_block virtio_scsi
efi_gpt efi_gpt
intel intel
bfs packagefs bfs packagefs