build: put each package build entry to separate line, adjust code style

Change-Id: Ib682fc276a08131e69fcdaa2cdba8c22d9e54a1a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8004
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Haiku-Format: Haiku-format Bot <no-reply+haikuformatbot@haiku-os.org>
This commit is contained in:
X512 2024-08-12 16:21:50 +09:00 committed by waddlesplash
parent 427d0b067b
commit ebe72d868b
5 changed files with 531 additions and 206 deletions

View File

@ -48,8 +48,7 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS =
AddFilesToFloppyBootArchive system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToFloppyBootArchive system add-ons kernel busses ata
:
AddFilesToFloppyBootArchive system add-ons kernel busses ata :
generic_ide_pci
ide_isa@x86
silicon_image_3112
@ -57,29 +56,24 @@ AddFilesToFloppyBootArchive system add-ons kernel busses ata
it8211
;
AddFilesToFloppyBootArchive system add-ons kernel busses scsi
:
AddFilesToFloppyBootArchive system add-ons kernel busses scsi :
ahci
;
AddFilesToFloppyBootArchive system add-ons kernel console
:
AddFilesToFloppyBootArchive system add-ons kernel console :
vga_text
;
AddFilesToFloppyBootArchive system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToFloppyBootArchive system add-ons kernel generic
:
AddFilesToFloppyBootArchive system add-ons kernel generic :
ata_adapter
locked_pool
scsi_periph
;
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
:
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems :
intel
session
;
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
:
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers :
openpic@ppc
;
@ -100,13 +94,11 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
}
# drivers
AddNewDriversToFloppyBootArchive disk scsi
:
AddNewDriversToFloppyBootArchive disk scsi :
scsi_cd
scsi_disk
;
AddNewDriversToFloppyBootArchive disk
:
AddNewDriversToFloppyBootArchive disk :
norflash@arm
;
if $(USB_BOOT) = 1 {
@ -125,8 +117,7 @@ if $(NET_BOOT) = 1 {
}
# kernel
AddFilesToFloppyBootArchive system
:
AddFilesToFloppyBootArchive system :
<revisioned>kernel_$(TARGET_ARCH)
;

View File

@ -48,39 +48,32 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS =
# modules
AddFilesToNetBootArchive system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToNetBootArchive system add-ons kernel busses agp_gart
:
AddFilesToNetBootArchive system add-ons kernel busses agp_gart :
<agp_gart>intel@x86
;
AddFilesToNetBootArchive system add-ons kernel busses ide
:
AddFilesToNetBootArchive system add-ons kernel busses ide :
generic_ide_pci
ide_isa@x86
silicon_image_3112
;
AddFilesToNetBootArchive system add-ons kernel busses scsi
:
AddFilesToNetBootArchive system add-ons kernel busses scsi :
ahci
;
AddFilesToNetBootArchive system add-ons kernel console
:
AddFilesToNetBootArchive system add-ons kernel console :
vga_text
;
AddFilesToNetBootArchive system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToNetBootArchive system add-ons kernel generic
:
AddFilesToNetBootArchive system add-ons kernel generic :
ata_adapter
locked_pool
scsi_periph
;
AddFilesToNetBootArchive system add-ons kernel partitioning_systems
:
AddFilesToNetBootArchive system add-ons kernel partitioning_systems :
intel
session
;
AddFilesToNetBootArchive system add-ons kernel interrupt_controllers
:
AddFilesToNetBootArchive system add-ons kernel interrupt_controllers :
openpic@ppc
;
@ -92,17 +85,14 @@ if $(TARGET_ARCH) = x86 {
}
# drivers
AddNewDriversToNetBootArchive disk scsi
:
AddNewDriversToNetBootArchive disk scsi :
scsi_cd
scsi_disk
;
AddDriversToNetBootArchive disk virtual
:
AddDriversToNetBootArchive disk virtual :
# nbd
;
AddDriversToNetBootArchive disk virtual
:
AddDriversToNetBootArchive disk virtual :
remote_disk
;
AddDriversToNetBootArchive net
@ -121,8 +111,7 @@ AddFilesToNetBootArchive home config settings kernel drivers
: $(driverSettingsFiles) ;
# add-ons
AddFilesToNetBootArchive system add-ons kernel network
:
AddFilesToNetBootArchive system add-ons kernel network :
stack
;
AddFilesToNetBootArchive system add-ons kernel network devices

View File

@ -23,68 +23,181 @@ for bootTarget in $(HAIKU_BOOT_TARGETS) {
# modules
AddFilesToPackage add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86,x86_64 ;
AddFilesToPackage add-ons kernel busses agp_gart :
<agp_gart>intel@x86,x86_64
;
AddFilesToPackage add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112 highpoint_ide_pci ide_isa@x86 ;
AddFilesToPackage add-ons kernel busses ata :
generic_ide_pci
it8211
legacy_sata
silicon_image_3112
highpoint_ide_pci
ide_isa@x86
;
AddFilesToPackage add-ons kernel busses i2c : pch_i2c@x86,x86_64 ;
AddFilesToPackage add-ons kernel busses mmc : sdhci ;
AddFilesToPackage add-ons kernel busses pci :
<pci>designware@riscv64 <pci>ecam@riscv64,arm,arm64 <pci>x86@x86,x86_64 ;
AddFilesToPackage add-ons kernel busses random : ccp_rng@x86,x86_64 virtio_rng ;
AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ;
AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci
<usb>xhci ;
AddFilesToPackage add-ons kernel busses virtio : virtio_mmio@riscv64,arm,arm64
virtio_pci ;
AddFilesToPackage add-ons kernel console : vga_text ;
AddFilesToPackage add-ons kernel debugger
: <kdebug>demangle <kdebug>disasm@x86,x86_64 <kdebug>hangman
<kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>qrencode@libqrencode
<kdebug>run_on_exit ;
AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToPackage add-ons kernel generic
: ata_adapter bios@x86,x86_64 dpc
locked_pool mpu401 scsi_periph smbios@x86,x86_64 <module>tty ;
AddFilesToPackage add-ons kernel partitioning_systems
: amiga_rdb@m68k apple@ppc sun@sparc efi_gpt intel session ;
AddFilesToPackage add-ons kernel interrupt_controllers : openpic@ppc ;
AddFilesToPackage add-ons kernel power cpufreq : amd_pstates@x86,x86_64 intel_pstates@x86,x86_64 ;
AddFilesToPackage add-ons kernel power cpuidle : intel_cstates@x86,x86_64 ;
AddFilesToPackage add-ons kernel busses i2c :
pch_i2c@x86,x86_64
;
AddFilesToPackage add-ons kernel busses mmc :
sdhci
;
AddFilesToPackage add-ons kernel busses pci :
<pci>designware@riscv64
<pci>ecam@riscv64,arm,arm64
<pci>x86@x86,x86_64
;
AddFilesToPackage add-ons kernel busses random :
ccp_rng@x86,x86_64
virtio_rng
;
AddFilesToPackage add-ons kernel busses scsi :
ahci
virtio_scsi
;
AddFilesToPackage add-ons kernel busses usb :
<usb>uhci
<usb>ohci
<usb>ehci
<usb>xhci
;
AddFilesToPackage add-ons kernel busses virtio :
virtio_mmio@riscv64,arm,arm64
virtio_pci
;
AddFilesToPackage add-ons kernel console :
vga_text
;
AddFilesToPackage add-ons kernel debugger :
<kdebug>demangle
<kdebug>disasm@x86,x86_64
<kdebug>hangman
<kdebug>invalidate_on_exit
<kdebug>usb_keyboard
<kdebug>qrencode@libqrencode
<kdebug>run_on_exit
;
AddFilesToPackage add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToPackage add-ons kernel generic :
ata_adapter
bios@x86,x86_64
dpc
locked_pool
mpu401
scsi_periph
smbios@x86,x86_64
<module>tty
;
AddFilesToPackage add-ons kernel partitioning_systems :
amiga_rdb@m68k
apple@ppc
sun@sparc
efi_gpt
intel
session
;
AddFilesToPackage add-ons kernel interrupt_controllers :
openpic@ppc
;
AddFilesToPackage add-ons kernel power cpufreq :
amd_pstates@x86,x86_64
intel_pstates@x86,x86_64
;
AddFilesToPackage add-ons kernel power cpuidle :
intel_cstates@x86,x86_64
;
if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
AddFilesToPackage add-ons kernel cpu : generic_x86 ;
AddFilesToPackage add-ons kernel cpu :
generic_x86
;
}
# drivers
AddNewDriversToPackage : wmi@x86,x86_64 ;
AddNewDriversToPackage disk : nvme_disk usb_disk ;
AddNewDriversToPackage disk mmc : mmc_disk ;
AddNewDriversToPackage disk scsi : scsi_cd scsi_disk ;
AddNewDriversToPackage disk virtual : ram_disk virtio_block ;
AddNewDriversToPackage graphics : virtio_gpu ;
AddNewDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
AddNewDriversToPackage sensor : $(SYSTEM_ADD_ONS_DRIVERS_SENSOR) ;
AddNewDriversToPackage network : usb_ecm virtio_net ;
AddNewDriversToPackage input : i2c_elan virtio_input ;
#AddNewDriversToPackage display : display_adapter@x86 ;
#AddNewDriversToPackage audio hmulti : virtio_sound ;
AddNewDriversToPackage :
wmi@x86,x86_64
;
AddNewDriversToPackage disk :
nvme_disk
usb_disk
;
AddNewDriversToPackage disk mmc :
mmc_disk
;
AddNewDriversToPackage disk scsi :
scsi_cd
scsi_disk
;
AddNewDriversToPackage disk virtual :
ram_disk
virtio_block
;
AddNewDriversToPackage graphics :
virtio_gpu
;
AddNewDriversToPackage power
: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
AddNewDriversToPackage sensor
: $(SYSTEM_ADD_ONS_DRIVERS_SENSOR) ;
AddNewDriversToPackage network :
usb_ecm
virtio_net
;
AddNewDriversToPackage input :
i2c_elan
virtio_input
;
AddNewDriversToPackage display :
# display_adapter@x86
;
AddNewDriversToPackage audio hmulti :
# virtio_sound
;
# legacy drivers
AddDriversToPackage : console dprintf null <driver>tty usb_modeswitch zero ;
AddDriversToPackage audio hmulti : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToPackage audio old : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
AddDriversToPackage bluetooth h2 : $(SYSTEM_ADD_ONS_DRIVERS_BT_H2) ;
AddDriversToPackage midi : $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
AddDriversToPackage bus : usb_raw ;
AddDriversToPackage disk virtual : nbd ;
AddDriversToPackage dvb : cx23882 ;
AddDriversToPackage graphics : $(SYSTEM_ADD_ONS_DRIVERS_GRAPHICS) ;
AddDriversToPackage input : ps2_hid usb_hid wacom ;
AddDriversToPackage misc : <driver>poke <driver>mem ;
AddDriversToPackage net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
AddDriversToPackage ports : pc_serial usb_serial ;
AddDriversToPackage :
console
dprintf
null
<driver>tty
usb_modeswitch
zero
;
AddDriversToPackage audio hmulti :
$(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToPackage audio old :
$(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
AddDriversToPackage bluetooth h2 :
$(SYSTEM_ADD_ONS_DRIVERS_BT_H2) ;
AddDriversToPackage midi :
$(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
AddDriversToPackage bus :
usb_raw
;
AddDriversToPackage disk virtual :
nbd
;
AddDriversToPackage dvb :
cx23882
;
AddDriversToPackage graphics
: $(SYSTEM_ADD_ONS_DRIVERS_GRAPHICS) ;
AddDriversToPackage input :
ps2_hid
usb_hid
wacom
;
AddDriversToPackage misc :
<driver>poke
<driver>mem
;
AddDriversToPackage net
: $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
AddDriversToPackage ports :
pc_serial
usb_serial
;
# kernel
AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ;
@ -113,11 +226,21 @@ AddFilesToPackage data trust_db : haiku-2019.pub ;
AddFilesToPackage servers : $(SYSTEM_SERVERS) ;
# apps
AddFilesToPackage : runtime_loader Deskbar Tracker ;
AddFilesToPackage bin : $(SYSTEM_BIN) consoled ;
AddFilesToPackage apps : $(SYSTEM_APPS) ;
AddFilesToPackage preferences : $(SYSTEM_PREFERENCES) ;
AddFilesToPackage demos : $(SYSTEM_DEMOS) ;
AddFilesToPackage :
runtime_loader
Deskbar
Tracker
;
AddFilesToPackage bin :
$(SYSTEM_BIN)
consoled
;
AddFilesToPackage apps
: $(SYSTEM_APPS) ;
AddFilesToPackage preferences
: $(SYSTEM_PREFERENCES) ;
AddFilesToPackage demos
: $(SYSTEM_DEMOS) ;
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToPackage bin : install-wifi-firmwares.sh ;
@ -189,45 +312,92 @@ AddFilesToPackage data Terminal Themes : $(terminalThemes) ;
# boot module links
AddBootModuleSymlinksToPackage
acpi@x86,x86_64,arm64 ahci ata ata_adapter
acpi@x86,x86_64,arm64
ahci
ata
ata_adapter
bfs
dpc
efi_gpt
generic_ide_pci
ide_isa@x86 isa@x86,x86_64 intel it8211
legacy_sata locked_pool
mmc mmc_disk
ide_isa@x86
isa@x86,x86_64
intel
it8211
legacy_sata
locked_pool
mmc
mmc_disk
nvme_disk
openpic@ppc
packagefs pci
<pci>designware@riscv64 <pci>ecam@riscv64,arm,arm64 <pci>x86@x86,x86_64
packagefs
pci
<pci>designware@riscv64
<pci>ecam@riscv64,arm,arm64
<pci>x86@x86,x86_64
fdt@riscv64,arm,arm64
scsi scsi_cd scsi_disk scsi_periph silicon_image_3112 highpoint_ide_pci
scsi
scsi_cd
scsi_disk
scsi_periph
silicon_image_3112
highpoint_ide_pci
sdhci
usb usb_disk <usb>ehci <usb>ohci <usb>uhci <usb>xhci
virtio virtio_block virtio_mmio@riscv64,arm,arm64 virtio_pci virtio_scsi
usb
usb_disk
<usb>ehci
<usb>ohci
<usb>uhci
<usb>xhci
virtio
virtio_block
virtio_mmio@riscv64,arm,arm64
virtio_pci
virtio_scsi
;
# add-ons
AddFilesToPackage add-ons accelerants : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
AddFilesToPackage add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
AddFilesToPackage add-ons accelerants :
$(SYSTEM_ADD_ONS_ACCELERANTS) ;
AddFilesToPackage add-ons locale catalogs :
$(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
AddFilesToPackage add-ons mail_daemon inbound_protocols : POP3
IMAP ;
AddFilesToPackage add-ons mail_daemon outbound_protocols : SMTP ;
AddFilesToPackage add-ons mail_daemon inbound_filters
: MatchHeader SpamFilter NewMailNotification ;
AddFilesToPackage add-ons mail_daemon outbound_filters : Fortune ;
AddFilesToPackage add-ons mail_daemon inbound_protocols :
POP3
IMAP
;
AddFilesToPackage add-ons mail_daemon outbound_protocols :
SMTP
;
AddFilesToPackage add-ons mail_daemon inbound_filters :
MatchHeader
SpamFilter
NewMailNotification
;
AddFilesToPackage add-ons mail_daemon outbound_filters :
Fortune
;
AddFilesToPackage add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
AddFilesToPackage add-ons Network\ Settings
: IPv4Interface IPv6Interface DNSClientService Hostname FTPService SSHService
TelnetService ;
AddFilesToPackage add-ons Network\ Settings :
IPv4Interface
IPv6Interface
DNSClientService
Hostname
FTPService
SSHService
TelnetService
;
AddFilesToPackage add-ons Tracker
: FileType Mark\ as… Mark\ as\ Read Open\ Target\ Folder
Open\ Terminal ZipOMatic ;
AddFilesToPackage add-ons Tracker :
FileType
Mark\ as…
Mark\ as\ Read
Open\ Target\ Folder
Open\ Terminal
ZipOMatic
;
AddSymlinkToPackage add-ons Tracker
: /boot/system/preferences/Backgrounds : Background ;
AddSymlinkToPackage add-ons Tracker
@ -235,26 +405,46 @@ AddSymlinkToPackage add-ons Tracker
AddSymlinkToPackage add-ons Tracker
: /boot/system/apps/DiskUsage : DiskUsage ;
AddFilesToPackage add-ons input_server devices
: <input>keyboard <input>mouse <input>tablet <input>virtio <input>wacom ;
AddFilesToPackage add-ons input_server filters
: padblocker screen_saver shortcut_catcher switch_workspace ;
AddFilesToPackage add-ons input_server devices :
<input>keyboard
<input>mouse
<input>tablet
<input>virtio
<input>wacom
;
AddFilesToPackage add-ons input_server filters :
padblocker
screen_saver
shortcut_catcher
switch_workspace
;
AddDirectoryToPackage add-ons input_server methods ;
AddFilesToPackage add-ons kernel network : <net>notifications stack ;
AddFilesToPackage add-ons kernel network : dns_resolver ;
AddFilesToPackage add-ons kernel network devices : $(SYSTEM_NETWORK_DEVICES) ;
AddFilesToPackage add-ons kernel network :
<net>notifications
stack
;
AddFilesToPackage add-ons kernel network :
dns_resolver
;
AddFilesToPackage add-ons kernel network devices
: $(SYSTEM_NETWORK_DEVICES) ;
AddFilesToPackage add-ons kernel network datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
AddFilesToPackage add-ons kernel network ppp : $(SYSTEM_NETWORK_PPP) ;
AddFilesToPackage add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ;
AddFilesToPackage add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ;
AddFilesToPackage add-ons Screen\ Savers : $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
AddFilesToPackage add-ons disk_systems
: <disk_system>fat <disk_system>intel <disk_system>gpt <disk_system>bfs
<disk_system>ntfs ;
AddFilesToPackage add-ons disk_systems :
<disk_system>fat
<disk_system>intel
<disk_system>gpt
<disk_system>bfs
<disk_system>ntfs
;
# Kernel bluetooth stack
AddFilesToPackage add-ons kernel bluetooth : $(SYSTEM_BT_STACK) ;

View File

@ -7,54 +7,135 @@ HaikuPackage $(haikuPackage) ;
# modules
AddFilesToPackage add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86,x86_64 ;
AddFilesToPackage add-ons kernel busses agp_gart :
<agp_gart>intel@x86,x86_64
;
AddFilesToPackage add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112 highpoint_ide_pci ide_isa@x86 ;
AddFilesToPackage add-ons kernel busses ata :
generic_ide_pci
it8211
legacy_sata
silicon_image_3112
highpoint_ide_pci
ide_isa@x86
;
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
<kdebug>invalidate_on_exit <kdebug>usb_keyboard
<kdebug>run_on_exit ;
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
<kdebug>invalidate_on_exit
<kdebug>usb_keyboard
<kdebug>run_on_exit
;
AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToPackage add-ons kernel generic
: ata_adapter bios@x86,x86_64 dpc
locked_pool mpu401 scsi_periph <module>tty ;
AddFilesToPackage add-ons kernel partitioning_systems
: amiga_rdb@m68k apple@ppc efi_gpt intel session ;
AddFilesToPackage add-ons kernel interrupt_controllers : openpic@ppc ;
AddFilesToPackage add-ons kernel power cpufreq : intel_pstates@x86,x86_64 ;
AddFilesToPackage add-ons kernel power cpuidle : intel_cstates@x86,x86_64 ;
AddFilesToPackage add-ons kernel generic :
ata_adapter
bios@x86,x86_64
dpc
locked_pool
mpu401
scsi_periph
<module>tty
;
AddFilesToPackage add-ons kernel partitioning_systems :
amiga_rdb@m68k
apple@ppc
efi_gpt
intel
session
;
AddFilesToPackage add-ons kernel interrupt_controllers :
openpic@ppc
;
AddFilesToPackage add-ons kernel power cpufreq :
intel_pstates@x86,x86_64
;
AddFilesToPackage add-ons kernel power cpuidle :
intel_cstates@x86,x86_64
;
if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
AddFilesToPackage add-ons kernel cpu : generic_x86 ;
AddFilesToPackage add-ons kernel cpu
:
generic_x86
;
}
# drivers
AddNewDriversToPackage disk scsi : scsi_cd scsi_disk ;
AddNewDriversToPackage disk virtual : ram_disk virtio_block ;
AddNewDriversToPackage power : acpi_battery@x86 ;
AddNewDriversToPackage network : virtio_net ;
#AddNewDriversToPackage display : display_adapter@x86 ;
AddNewDriversToPackage disk scsi :
scsi_cd
scsi_disk
;
AddNewDriversToPackage disk virtual :
ram_disk
virtio_block
;
AddNewDriversToPackage power :
acpi_battery@x86
;
AddNewDriversToPackage network :
virtio_net
;
AddNewDriversToPackage display :
# display_adapter@x86
;
# legacy drivers
AddDriversToPackage : console dprintf null random <driver>tty
zero ;
AddDriversToPackage audio hmulti : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToPackage audio old : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
AddDriversToPackage midi : $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
AddDriversToPackage bus : usb_raw ;
AddDriversToPackage disk virtual : nbd ;
AddDriversToPackage graphics : $(SYSTEM_ADD_ONS_DRIVERS_GRAPHICS) ;
AddDriversToPackage input : ps2_hid usb_hid wacom ;
AddDriversToPackage misc : <driver>poke <driver>mem ;
AddDriversToPackage net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
AddDriversToPackage ports : pc_serial usb_serial ;
AddDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
AddDriversToPackage :
console
dprintf
null
random
<driver>tty
zero
;
AddDriversToPackage audio hmulti
: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToPackage audio old
: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
AddDriversToPackage midi
: $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
AddDriversToPackage bus :
usb_raw
;
AddDriversToPackage disk virtual :
nbd
;
AddDriversToPackage graphics
: $(SYSTEM_ADD_ONS_DRIVERS_GRAPHICS) ;
AddDriversToPackage input :
ps2_hid
usb_hid
wacom
;
AddDriversToPackage misc :
<driver>poke
<driver>mem
;
AddDriversToPackage net
: $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
AddDriversToPackage ports :
pc_serial
usb_serial
;
AddDriversToPackage power
: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
# kernel
AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ;
@ -79,11 +160,21 @@ if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 1 {
AddFilesToPackage servers : $(SYSTEM_SERVERS) ;
# apps
AddFilesToPackage : runtime_loader Deskbar Tracker ;
AddFilesToPackage bin : $(SYSTEM_BIN) consoled ;
AddFilesToPackage apps : $(SYSTEM_APPS) ;
AddFilesToPackage preferences : $(SYSTEM_PREFERENCES) ;
AddFilesToPackage demos : $(SYSTEM_DEMOS) ;
AddFilesToPackage :
runtime_loader
Deskbar
Tracker
;
AddFilesToPackage bin :
$(SYSTEM_BIN)
consoled
;
AddFilesToPackage apps
: $(SYSTEM_APPS) ;
AddFilesToPackage preferences
: $(SYSTEM_PREFERENCES) ;
AddFilesToPackage demos
: $(SYSTEM_DEMOS) ;
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToPackage bin : install-wifi-firmwares.sh ;
@ -142,19 +233,37 @@ AddFilesToPackage data Terminal Themes : $(terminalThemes) ;
# boot module links
AddBootModuleSymlinksToPackage
acpi@x86,x86_64 ata pci isa@x86,x86_64 dpc
scsi usb
acpi@x86,x86_64
ata
pci
isa@x86,x86_64
dpc
scsi
usb
openpic@ppc
ata_adapter locked_pool scsi_periph
ahci generic_ide_pci it8211 legacy_sata silicon_image_3112
ata_adapter
locked_pool
scsi_periph
ahci
generic_ide_pci
it8211
legacy_sata
silicon_image_3112
highpoint_ide_pci
ide_isa@x86
<usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk
virtio virtio_pci virtio_block virtio_scsi
<usb>uhci
<usb>ohci
<usb>ehci
scsi_cd
scsi_disk
virtio
virtio_pci
virtio_block
virtio_scsi
efi_gpt
intel
bfs packagefs
bfs
packagefs
;
# add-ons
@ -162,9 +271,14 @@ AddFilesToPackage add-ons accelerants : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
AddFilesToPackage add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
AddFilesToPackage add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
AddFilesToPackage add-ons Tracker
: FileType Mark\ as… Mark\ as\ Read Open\ Target\ Folder
Open\ Terminal ZipOMatic ;
AddFilesToPackage add-ons Tracker :
FileType
Mark\ as…
Mark\ as\ Read
Open\ Target\ Folder
Open\ Terminal
ZipOMatic
;
AddSymlinkToPackage add-ons Tracker
: /boot/system/preferences/Backgrounds : Background-B ;
AddSymlinkToPackage add-ons Tracker
@ -172,22 +286,38 @@ AddSymlinkToPackage add-ons Tracker
AddSymlinkToPackage add-ons Tracker
: /boot/system/apps/DiskUsage : DiskUsage-I ;
AddFilesToPackage add-ons input_server devices
: <input>keyboard <input>mouse <input>tablet <input>wacom ;
AddFilesToPackage add-ons input_server filters
: switch_workspace ;
AddFilesToPackage add-ons input_server devices :
<input>keyboard
<input>mouse
<input>tablet
<input>wacom
;
AddFilesToPackage add-ons input_server filters :
switch_workspace
;
AddFilesToPackage add-ons kernel network : <net>notifications stack ;
AddFilesToPackage add-ons kernel network : dns_resolver ;
AddFilesToPackage add-ons kernel network devices : $(SYSTEM_NETWORK_DEVICES) ;
AddFilesToPackage add-ons kernel network :
<net>notifications
stack
;
AddFilesToPackage add-ons kernel network :
dns_resolver
;
AddFilesToPackage add-ons kernel network devices
: $(SYSTEM_NETWORK_DEVICES) ;
AddFilesToPackage add-ons kernel network datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
AddFilesToPackage add-ons kernel network ppp : $(SYSTEM_NETWORK_PPP) ;
AddFilesToPackage add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ;
AddFilesToPackage add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ;
AddFilesToPackage add-ons disk_systems
: <disk_system>intel <disk_system>gpt <disk_system>bfs <disk_system>ntfs ;
AddFilesToPackage add-ons disk_systems :
<disk_system>intel
<disk_system>gpt
<disk_system>bfs
<disk_system>ntfs
;
# the MIME DB
@ -197,9 +327,17 @@ CopyDirectoryToPackage data : <mimedb>mime_db : : : isTarget ;
# Deskbar menu symlinks
# "Applications" links
DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap DeskCalc
Devices DiskProbe DriveSetup DiskUsage Expander Installer
StyledEdit Terminal
DESKBAR_APPLICATIONS =
ActivityMonitor
CharacterMap DeskCalc
Devices
DiskProbe
DriveSetup
DiskUsage
Expander
Installer
StyledEdit
Terminal
;
local linkTarget ;
for linkTarget in $(DESKBAR_APPLICATIONS) {
@ -208,7 +346,11 @@ for linkTarget in $(DESKBAR_APPLICATIONS) {
}
# "Desktop applets" links
DESKBAR_DESKTOP_APPLETS = LaunchBox NetworkStatus PowerStatus ProcessController
DESKBAR_DESKTOP_APPLETS =
LaunchBox
NetworkStatus
PowerStatus
ProcessController
Workspaces
;
for linkTarget in $(DESKBAR_DESKTOP_APPLETS) {

View File

@ -5,16 +5,23 @@ HaikuPackage $(extrasPackage) ;
## Apps Oddities
AddFilesToPackage bin : acpi_call ;
AddFilesToPackage apps : TV ;
AddFilesToPackage bin :
acpi_call
;
AddFilesToPackage apps :
TV
;
AddSymlinkToPackage data deskbar menu Applications : ../../../../apps/TV : TV ;
## Driver Oddities
# kernel modules
AddFilesToPackage add-ons kernel partitioning_systems
: amiga_rdb@!m68k apple@!ppc sun@!sparc ;
AddFilesToPackage add-ons kernel partitioning_systems :
amiga_rdb@!m68k
apple@!ppc
sun@!sparc
;
## Visual Oddities
@ -22,10 +29,16 @@ AddFilesToPackage add-ons kernel partitioning_systems
# MacDecorator WinDecorator need improved stack and tile support
# Control Looks
AddFilesToPackage add-ons control_look : BeControlLook FlatControlLook ;
AddFilesToPackage add-ons control_look :
BeControlLook
FlatControlLook
;
# Decorators
AddFilesToPackage add-ons decorators : BeDecorator FlatDecorator ;
AddFilesToPackage add-ons decorators :
BeDecorator
FlatDecorator
;
BuildHaikuPackage $(extrasPackage) : haiku_extras ;