[haiku-commits] BRANCH HaikuPM-github.package-management [ebb8576] in build/jam: packages images
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 15 Jul 2013 16:45:32 +0200 (CEST)
added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 03d70b4e58f04e54ed9d76a072a0b66750f7037c
new head: ebb857698e1b20d080d3906a0cc0691e39ed2b22
overview: https://github.com/haiku/HaikuPM/compare/03d70b4...ebb8576
----------------------------------------------------------------------------
ebb8576: Update bootstrap image/package
Should have been part of the recent merge.
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
Commit: ebb857698e1b20d080d3906a0cc0691e39ed2b22
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Mon Jul 15 14:34:41 2013 UTC
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 3 deletions(-)
build/jam/images/HaikuImageBootstrap | 5 +++--
build/jam/packages/HaikuBootstrap | 5 ++++-
----------------------------------------------------------------------------
diff --git a/build/jam/images/HaikuImageBootstrap
b/build/jam/images/HaikuImageBootstrap
index 8160685..0bc3eef 100644
--- a/build/jam/images/HaikuImageBootstrap
+++ b/build/jam/images/HaikuImageBootstrap
@@ -35,7 +35,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
setversion setvolume seq sha1sum sha256sum shar shred shuf shutdown
sleep
sort split stat strace stty su sum sync sysinfo
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
<bin>updatedb uptime urlwrapper useradd uudecode uuencode
vdir version vmstat
@@ -46,7 +46,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
SYSTEM_APPS = [ FFilterByBuildFeatures
AboutSystem ActivityMonitor BootManager@x86 CharacterMap
- DeskCalc Devices DiskProbe DiskUsage DriveSetup Debugger
+ DeskCalc Debugger Devices DiskProbe DiskUsage DriveSetup
Expander Installer LaunchBox
NetworkStatus PackageInstaller
PowerStatus ProcessController ShowImage
@@ -146,6 +146,7 @@ SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures
acpi_button@x86 ] ;
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
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
attribute_overlay write_overlay ntfs packagefs reiserfs@x86 udf ;
diff --git a/build/jam/packages/HaikuBootstrap
b/build/jam/packages/HaikuBootstrap
index 9d7d282..5072c1d 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -33,8 +33,9 @@ if $(HAIKU_ATA_STACK) = 1 {
: 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 virtio : virtio_pci ;
AddFilesToPackage add-ons kernel console : vga_text ;
AddFilesToPackage add-ons kernel debugger
: <kdebug>demangle <kdebug>disasm@x86 <kdebug>hangman
@@ -54,6 +55,7 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
# drivers
AddNewDriversToPackage disk scsi : scsi_cd scsi_disk ;
+AddNewDriversToPackage disk virtual : virtio_block ;
AddNewDriversToPackage power : enhanced_speedstep@x86 ;
AddNewDriversToPackage power : acpi_battery@x86 ;
#AddNewDriversToPackage display : display_controls@x86 ;
@@ -216,6 +218,7 @@ AddBootModuleSymlinksToPackage
ide_isa@x86
<usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk usb_disk
+ virtio virtio_pci virtio_block virtio_scsi
efi_gpt
intel
bfs packagefs
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [ebb8576] in build/jam: packages images - HaikuPM-github . package-management
