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

Restore up-to-date HaikuImage

Browse Source 
While merging nfs4 branch accidentally outdated version of HaikuImage was used
to resolve conflicts. This commit corrects that mistake.
This commit is contained in:
Pawel Dziepak
2013-03-11 15:18:02 +01:00
parent 8f5358e419
commit 89878bd670
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+4 -4
View File
@@ -18,7 +18,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
hd head hey hostname
id ident ifconfig <bin>install installsound iroster isvolume
ideinfo@ide idestatus@ide
join kernel_debugger keymap kill
join kernel_debugger keymap keystore kill
less lessecho lesskey link linkcatkeys listarea listattr listimage listdev
listport listres listsem listusb ln locale locate logger login logname ls
lsindex
@@ -84,7 +84,7 @@ PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures
libilmimf.so
] ;
SYSTEM_SERVERS = [ FFilterByBuildFeatures
app_server cddb_daemon debug_server input_server mail_daemon
app_server cddb_daemon debug_server input_server keystore_server mail_daemon
media_addon_server media_server midi_server mount_server net_server
notification_server power_daemon print_server print_addon_server registrar
syslog_daemon dns_resolver_server nfs4_idmapper_server
@@ -232,7 +232,7 @@ AddFilesToHaikuImage system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToHaikuImage system add-ons kernel generic
: ata_adapter@ata bios@x86 dpc ide_adapter@ide
locked_pool mpu401 scsi_periph <module>tty ; #cpuidle@x86 ;
locked_pool mpu401 scsi_periph <module>tty cpuidle@x86 ;
AddFilesToHaikuImage system add-ons kernel partitioning_systems
: amiga_rdb apple efi_gpt intel session ;
AddFilesToHaikuImage system add-ons kernel interrupt_controllers
@@ -246,7 +246,7 @@ if $(TARGET_ARCH) = x86 {
AddNewDriversToHaikuImage disk scsi : scsi_cd scsi_disk ;
AddNewDriversToHaikuImage power : enhanced_speedstep@x86 ;
AddNewDriversToHaikuImage power : acpi_battery@x86 ;
#AddNewDriversToHaikuImage power : x86_cpuidle@x86 ;
AddNewDriversToHaikuImage power : x86_cpuidle@x86 ;
#AddNewDriversToHaikuImage display : display_controls@x86 ;
# legacy drivers