25a7b01d15
Additional changes: * Add src/system/kernel/lib/zlib, which builds a kernel version of zlib, needed by packagefs. * BuildFeatures: Add a build feature "gcc2" to allow for easier checks. * Referenceable.cpp: Include <OS.h> instead of <debugger.h>. The latter is not needed and prevents building for the build platform. * zlib/zutil.h: Fix gcc 2 build. We really should use the external package instead. Conflicts: .gitignore build/jam/BuildSetup build/jam/FileRules build/jam/FloppyBootImage build/jam/HaikuImage build/jam/ImageRules build/jam/KernelRules build/jam/NetBootArchive build/jam/OptionalBuildFeatures build/jam/OptionalLibPackages build/jam/OptionalPackageDependencies build/jam/OptionalPackages build/scripts/build_haiku_image configure data/bin/installoptionalpackage data/system/boot/Bootscript headers/os/app/Message.h headers/os/package/PackageInfo.h headers/os/package/PackageInfoAttributes.h headers/os/package/PackageInfoSet.h headers/os/package/PackageRoster.h headers/os/package/PackageVersion.h headers/os/package/hpkg/PackageInfoAttributeValue.h headers/os/storage/FindDirectory.h headers/os/storage/Node.h headers/os/support/StringList.h headers/private/system/directories.h src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile src/add-ons/kernel/file_systems/packagefs/AttributeIndex.cpp src/add-ons/kernel/file_systems/packagefs/Jamfile src/add-ons/kernel/file_systems/packagefs/Package.cpp src/add-ons/kernel/file_systems/packagefs/Package.h src/add-ons/kernel/file_systems/packagefs/PackageDomain.cpp src/add-ons/kernel/file_systems/packagefs/PackageDomain.h src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.h src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.h src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.cpp src/add-ons/kernel/file_systems/packagefs/PackageNode.h src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.cpp src/add-ons/kernel/file_systems/packagefs/Version.cpp src/add-ons/kernel/file_systems/packagefs/Version.h src/add-ons/kernel/file_systems/packagefs/Volume.cpp src/add-ons/kernel/file_systems/packagefs/Volume.h src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp src/add-ons/kernel/file_systems/userlandfs/shared/driver_settings.c src/apps/deskbar/BarApp.cpp src/apps/deskbar/BarMenuBar.cpp src/apps/deskbar/BarMenuBar.h src/apps/deskbar/BarView.cpp src/apps/deskbar/BarView.h src/apps/deskbar/BarWindow.cpp src/apps/deskbar/BarWindow.h src/apps/deskbar/DeskbarMenu.cpp src/apps/deskbar/DeskbarMenu.h src/apps/deskbar/DeskbarUtils.cpp src/apps/deskbar/DeskbarUtils.h src/apps/deskbar/ExpandoMenuBar.cpp src/apps/deskbar/ExpandoMenuBar.h src/apps/deskbar/TeamMenu.cpp src/apps/processcontroller/ProcessController.cpp src/apps/remotedesktop/RemoteDesktop.cpp src/bin/bash/config-top.h src/bin/finddir.c src/bin/package/Jamfile src/bin/package/command_add.cpp src/bin/package/command_create.cpp src/bin/package/command_list.cpp src/bin/package_repo/command_list.cpp src/bin/pkgman/command_refresh.cpp src/build/libbe/support/Jamfile src/build/libpackage/Jamfile src/build/libroot/Jamfile src/build/libroot/fs.cpp src/build/libroot/remapped_functions.h src/kits/locale/MutableLocaleRoster.cpp src/kits/opengl/GLRendererRoster.cpp src/kits/package/PackageInfo.cpp src/kits/package/PackageInfoSet.cpp src/kits/package/PackageRoster.cpp src/kits/package/PackageVersion.cpp src/kits/package/RepositoryCache.cpp src/kits/package/hpkg/PackageWriterImpl.cpp src/kits/package/hpkg/ReaderImplBase.cpp src/kits/package/hpkg/WriterImplBase.cpp src/kits/print/PrintTransport.cpp src/kits/print/Printer.cpp src/kits/screensaver/ScreenSaverRunner.cpp src/kits/support/StringList.cpp src/kits/tracker/ContainerWindow.cpp src/kits/tracker/DeskWindow.cpp src/kits/tracker/PoseView.cpp src/libs/print/libprint/Transport.cpp src/preferences/printers/AddPrinterDialog.cpp src/preferences/screensaver/ScreenSaverWindow.cpp src/servers/debug/DebugServer.cpp src/servers/input/AddOnManager.cpp src/servers/media_addon/MediaAddonServer.cpp src/system/boot/Jamfile src/system/boot/loader/Jamfile src/system/boot/loader/loader.cpp src/system/boot/loader/vfs.cpp src/system/kernel/fs/vfs.cpp src/system/kernel/fs/vfs_boot.cpp src/system/libroot/os/find_directory.cpp src/system/runtime_loader/runtime_loader.cpp src/tools/package/Jamfile
225 lines
6.7 KiB
Plaintext
225 lines
6.7 KiB
Plaintext
# This file defines what ends up in the floppy boot image and it executes the
|
|
# rules building the image.
|
|
|
|
|
|
#HACK: remove when old ide code is removed!
|
|
|
|
local NET_BOOT = 0 ;
|
|
local USB_BOOT = 1 ;
|
|
|
|
local USB_ONLY = ;
|
|
if $(USB_BOOT) = 1 {
|
|
USB_ONLY = "" ;
|
|
}
|
|
|
|
local BOOT_ADD_ONS_NET ;
|
|
if $(NET_BOOT) = 1 {
|
|
BOOT_ADD_ONS_NET =
|
|
remote_disk
|
|
$(SYSTEM_ADD_ONS_DRIVERS_NET)
|
|
stack socket
|
|
$(SYSTEM_NETWORK_DEVICES)
|
|
$(SYSTEM_NETWORK_DATALINK_PROTOCOLS)
|
|
$(SYSTEM_NETWORK_PPP)
|
|
$(SYSTEM_NETWORK_PROTOCOLS)
|
|
;
|
|
}
|
|
|
|
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
|
|
acpi@x86 ata@ata config_manager dpc pci
|
|
ide@ide isa@x86 scsi $(USB_ONLY)usb
|
|
] ;
|
|
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
|
|
|
|
|
|
if $(TARGET_ARCH) = x86_64 {
|
|
AddFilesToFloppyBootArchive system add-ons kernel bus_managers
|
|
: ata config_manager dpc pci isa scsi $(USB_ONLY)usb ;
|
|
AddFilesToFloppyBootArchive system add-ons kernel busses ata
|
|
: generic_ide_pci legacy_sata ;
|
|
AddFilesToFloppyBootArchive system add-ons kernel busses scsi
|
|
: ahci ;
|
|
AddFilesToFloppyBootArchive system add-ons kernel file_systems
|
|
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
|
|
AddFilesToFloppyBootArchive system add-ons kernel generic
|
|
: ata_adapter locked_pool scsi_periph ;
|
|
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
|
|
: intel session ;
|
|
|
|
if $(USB_BOOT) = 1 {
|
|
AddFilesToFloppyBootArchive system add-ons kernel busses usb
|
|
: <usb>uhci <usb>ohci <usb>ehci ;
|
|
}
|
|
|
|
AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
|
|
|
|
AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
|
|
if $(USB_BOOT) = 1 {
|
|
AddDriversToFloppyBootArchive disk usb : usb_disk ;
|
|
}
|
|
} else {
|
|
# modules
|
|
AddFilesToFloppyBootArchive system add-ons kernel bus_managers
|
|
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
|
|
|
|
if $(HAIKU_ATA_STACK) = 1 {
|
|
AddFilesToFloppyBootArchive system add-ons kernel busses ata
|
|
: generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
|
|
it8211 ;
|
|
} else {
|
|
AddFilesToFloppyBootArchive system add-ons kernel busses ide
|
|
: generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
|
|
it8211 ;
|
|
}
|
|
|
|
AddFilesToFloppyBootArchive system add-ons kernel busses scsi
|
|
: ahci ;
|
|
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
|
|
: ata_adapter@ata ide_adapter@ide locked_pool scsi_periph ;
|
|
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
|
|
: intel session ;
|
|
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
|
|
: openpic@ppc ;
|
|
|
|
if $(USB_BOOT) = 1 {
|
|
AddFilesToFloppyBootArchive system add-ons kernel busses usb
|
|
: <usb>uhci <usb>ohci <usb>ehci ;
|
|
}
|
|
|
|
if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
|
|
AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
|
|
}
|
|
|
|
# drivers
|
|
AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
|
|
AddNewDriversToFloppyBootArchive disk : norflash@arm ;
|
|
if $(USB_BOOT) = 1 {
|
|
AddDriversToFloppyBootArchive disk usb : usb_disk ;
|
|
}
|
|
if $(NET_BOOT) = 1 {
|
|
AddDriversToFloppyBootArchive disk virtual : remote_disk ;
|
|
AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
|
|
}
|
|
}
|
|
|
|
# kernel
|
|
AddFilesToFloppyBootArchive system
|
|
: <revisioned>kernel_$(TARGET_ARCH) ;
|
|
|
|
# scripts and data files
|
|
|
|
local driverSettingsFiles = <driver-settings>kernel ;
|
|
SEARCH on $(driverSettingsFiles)
|
|
= [ FDirName $(HAIKU_TOP) data settings kernel drivers ] ;
|
|
AddFilesToFloppyBootArchive home config settings kernel drivers
|
|
: $(driverSettingsFiles) ;
|
|
|
|
if $(NET_BOOT) = 1 {
|
|
# add-ons
|
|
AddFilesToFloppyBootArchive system add-ons kernel network
|
|
: stack socket ;
|
|
AddFilesToFloppyBootArchive
|
|
system add-ons kernel network devices
|
|
: $(SYSTEM_NETWORK_DEVICES) ;
|
|
AddFilesToFloppyBootArchive
|
|
system add-ons kernel network datalink_protocols
|
|
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
|
|
AddFilesToFloppyBootArchive
|
|
system add-ons kernel network ppp
|
|
: $(SYSTEM_NETWORK_PPP) ;
|
|
AddFilesToFloppyBootArchive
|
|
system add-ons kernel network protocols
|
|
: $(SYSTEM_NETWORK_PROTOCOLS) ;
|
|
}
|
|
|
|
# boot module links
|
|
if $(TARGET_ARCH) = x86_64 {
|
|
AddBootModuleSymlinksToFloppyBootArchive
|
|
ata dpc config_manager pci scsi $(USB_ONLY)usb ata_adapter locked_pool
|
|
scsi_periph generic_x86 ahci generic_ide_pci legacy_sata
|
|
$(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
|
|
scsi_cd scsi_disk $(USB_ONLY)usb_disk
|
|
intel session
|
|
$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
|
|
;
|
|
} else {
|
|
AddBootModuleSymlinksToFloppyBootArchive
|
|
$(SYSTEM_ADD_ONS_BUS_MANAGERS)
|
|
openpic@ppc
|
|
ata_adapter@ata ide_adapter@ide locked_pool scsi_periph
|
|
generic_x86@x86
|
|
ahci generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
|
|
it8211
|
|
$(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
|
|
scsi_cd scsi_disk $(USB_ONLY)usb_disk norflash@arm
|
|
intel session
|
|
$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
|
|
$(BOOT_ADD_ONS_NET)
|
|
;
|
|
}
|
|
|
|
|
|
#pragma mark - Build The Archive
|
|
|
|
# archive target
|
|
HAIKU_FLOPPY_BOOT_ARCHIVE = haiku-floppyboot.tgz ;
|
|
MakeLocate $(HAIKU_FLOPPY_BOOT_ARCHIVE) : $(HAIKU_OUTPUT_DIR) ;
|
|
|
|
# the pseudo target all archive contents is attached to
|
|
NotFile $(HAIKU_BOOT_FLOPPY_CONTAINER_NAME) ;
|
|
|
|
# prepare the script that initializes the shell variables
|
|
local initVarsScript = <FloppyBootArchive>haiku-floppyboot-init-vars ;
|
|
local script = $(initVarsScript) ;
|
|
MakeLocate $(script) : $(HAIKU_OUTPUT_DIR) ;
|
|
Always $(script) ;
|
|
|
|
AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
|
|
AddVariableToScript $(script) : addBuildCompatibilityLibDir
|
|
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
|
|
AddTargetVariableToScript $(script) : <build>copyattr ;
|
|
|
|
# create the other scripts
|
|
local makeDirsScript = <FloppyBootArchive>haiku-floppyboot-make-dirs ;
|
|
local copyFilesScript = <FloppyBootArchive>haiku-floppyboot-copy-files ;
|
|
MakeLocate $(makeDirsScript) $(copyFilesScript) : $(HAIKU_OUTPUT_DIR) ;
|
|
|
|
CreateFloppyBootArchiveMakeDirectoriesScript $(makeDirsScript) ;
|
|
CreateFloppyBootArchiveCopyFilesScript $(copyFilesScript) ;
|
|
|
|
# build the archive
|
|
|
|
BuildFloppyBootArchive $(HAIKU_FLOPPY_BOOT_ARCHIVE) :
|
|
$(initVarsScript)
|
|
$(makeDirsScript)
|
|
$(copyFilesScript)
|
|
;
|
|
|
|
# remove the scripts we have generated
|
|
RmTemps $(HAIKU_FLOPPY_BOOT_ARCHIVE) :
|
|
$(initVarsScript)
|
|
$(makeDirsScript)
|
|
$(copyFilesScript)
|
|
;
|
|
|
|
NotFile haiku-floppyboot-archive ;
|
|
Depends haiku-floppyboot-archive : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
|
|
|
|
# floppy image target
|
|
HAIKU_BOOT_FLOPPY = haiku-boot-floppy.image ;
|
|
MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
|
|
|
|
BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : haiku_loader
|
|
: $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
|
|
|
|
# remove the archive
|
|
RmTemps $(HAIKU_BOOT_FLOPPY) : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
|
|
|
|
NotFile haiku-boot-floppy ;
|
|
Depends haiku-boot-floppy : $(HAIKU_BOOT_FLOPPY) ;
|
|
|
|
|