Merge branch 'master' into pm-flat
Conflicts: build/jam/HaikuImage build/jam/OptionalBuildFeatures build/jam/OptionalPackages build/jam/UserBuildConfig.sample data/bin/installoptionalpackage src/apps/deskbar/DeskbarMenu.cpp src/servers/debug/DebugServer.cpp src/system/kernel/fs/vfs.cpp
This commit is contained in:
Ingo Weinhold
@@ -42,7 +42,7 @@
|
||||
#define DEBUG_FILE_MAP KDEBUG_LEVEL_1
|
||||
|
||||
|
||||
// heap
|
||||
// heap / slab
|
||||
|
||||
// Initialize newly allocated memory with something non zero.
|
||||
#define PARANOID_KERNEL_MALLOC KDEBUG_LEVEL_2
|
||||
@@ -57,6 +57,9 @@
|
||||
// Enables the "allocations*" debugger commands.
|
||||
#define KERNEL_HEAP_LEAK_CHECK 0
|
||||
|
||||
// Enables the "allocations*" debugger commands for the slab.
|
||||
#define SLAB_ALLOCATION_TRACKING 0
|
||||
|
||||
|
||||
// interrupts
|
||||
|
||||
|
||||
@@ -47,7 +47,9 @@
|
||||
#define SCHEDULING_ANALYSIS_TRACING 0
|
||||
#define SIGNAL_TRACING 0
|
||||
#define SLAB_MEMORY_MANAGER_TRACING 0
|
||||
#define SLAB_MEMORY_MANAGER_TRACING_STACK_TRACE 0 /* stack trace depth */
|
||||
#define SLAB_OBJECT_CACHE_TRACING 0
|
||||
#define SLAB_OBJECT_CACHE_TRACING_STACK_TRACE 0 /* stack trace depth */
|
||||
#define SWAP_TRACING 0
|
||||
#define SYSCALL_TRACING 0
|
||||
#define SYSCALL_TRACING_IGNORE_KTRACE_OUTPUT 1
|
||||
|
||||
+19
-10
@@ -66,7 +66,7 @@ HAIKU_DEFAULT_IMAGE_NAME = haiku.image ;
|
||||
HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ;
|
||||
HAIKU_DEFAULT_VMWARE_IMAGE_NAME = haiku.vmdk ;
|
||||
HAIKU_DEFAULT_INSTALL_DIR = /Haiku ;
|
||||
HAIKU_DEFAULT_IMAGE_SIZE ?= 230 ; # 230 MB
|
||||
HAIKU_DEFAULT_IMAGE_SIZE ?= 300 ; # 300 MB
|
||||
HAIKU_DEFAULT_IMAGE_LABEL ?= Haiku ;
|
||||
|
||||
# Haiku CD defaults
|
||||
@@ -155,10 +155,14 @@ HAIKU_LINK = $(HAIKU_CC) ;
|
||||
HAIKU_LINKFLAGS = $(HAIKU_GCC_BASE_FLAGS) ;
|
||||
|
||||
HAIKU_HDRS = [ FStandardHeaders ] ;
|
||||
HAIKU_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) -nostdinc ;
|
||||
HAIKU_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) -nostdinc ;
|
||||
HAIKU_KERNEL_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) ;
|
||||
HAIKU_KERNEL_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) ;
|
||||
|
||||
HAIKU_CUSTOM_CCFLAGS = $(HAIKU_CCFLAGS) ;
|
||||
HAIKU_CUSTOM_C++FLAGS = $(HAIKU_C++FLAGS) ;
|
||||
|
||||
HAIKU_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_CCFLAGS) -nostdinc ;
|
||||
HAIKU_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_C++FLAGS) -nostdinc ;
|
||||
HAIKU_KERNEL_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_CCFLAGS) ;
|
||||
HAIKU_KERNEL_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_C++FLAGS) ;
|
||||
HAIKU_DEFINES = __HAIKU__ ;
|
||||
HAIKU_NO_WERROR ?= 0 ;
|
||||
|
||||
@@ -270,7 +274,7 @@ switch $(HAIKU_CPU) {
|
||||
}
|
||||
}
|
||||
# offset in floppy image (>= sizeof(haiku_loader))
|
||||
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
|
||||
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 260 ; # in kB
|
||||
HAIKU_NO_WERROR = 1 ;
|
||||
# we use #warning as placeholders for things to write...
|
||||
}
|
||||
@@ -352,10 +356,15 @@ switch $(HAIKU_ARCH) {
|
||||
}
|
||||
case x86 :
|
||||
{
|
||||
HAIKU_CCFLAGS += -march=pentium ;
|
||||
HAIKU_C++FLAGS += -march=pentium ;
|
||||
HAIKU_KERNEL_CCFLAGS += -march=pentium ;
|
||||
HAIKU_KERNEL_C++FLAGS += -march=pentium ;
|
||||
if $(HAIKU_CUSTOM_CCFLAGS) = '' {
|
||||
HAIKU_CCFLAGS += -march=pentium ;
|
||||
HAIKU_KERNEL_CCFLAGS += -march=pentium ;
|
||||
}
|
||||
|
||||
if $(HAIKU_CUSTOM_C++FLAGS) = '' {
|
||||
HAIKU_C++FLAGS += -march=pentium ;
|
||||
HAIKU_KERNEL_C++FLAGS += -march=pentium ;
|
||||
}
|
||||
|
||||
# Enable use of the gcc built-in atomic functions instead of atomic_*().
|
||||
# The former are inlined and have thus less overhead. They are not
|
||||
|
||||
+9
-10
@@ -105,7 +105,7 @@ PRIVATE_SYSTEM_LIBS =
|
||||
;
|
||||
SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
|
||||
media_addon_server media_server midi_server mount_server net_server
|
||||
notification_server print_server print_addon_server registrar syslog_daemon
|
||||
notification_server power_daemon print_server print_addon_server registrar syslog_daemon
|
||||
;
|
||||
|
||||
SYSTEM_NETWORK_DEVICES = ethernet loopback ;
|
||||
@@ -120,7 +120,7 @@ SYSTEM_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant
|
||||
$(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant
|
||||
$(X86_ONLY)ati.accelerant
|
||||
$(X86_ONLY)3dfx.accelerant
|
||||
#$(X86_ONLY)radeon_hd.accelerant
|
||||
$(X86_ONLY)radeon_hd.accelerant
|
||||
#$(X86_ONLY)via.accelerant
|
||||
#$(X86_ONLY)vmware.accelerant
|
||||
;
|
||||
@@ -166,7 +166,7 @@ SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ;
|
||||
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
|
||||
$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme
|
||||
$(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware
|
||||
$(X86_ONLY)ati $(X86_ONLY)3dfx #$(X86_ONLY)radeon_hd
|
||||
$(X86_ONLY)ati $(X86_ONLY)3dfx $(X86_ONLY)radeon_hd
|
||||
;
|
||||
SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ;
|
||||
SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
|
||||
@@ -175,7 +175,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
|
||||
$(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0
|
||||
$(X86_ONLY)marvell_yukon $(X86_ONLY)nforce $(X86_ONLY)pcnet pegasus
|
||||
$(X86_ONLY)rtl8139 $(X86_ONLY)rtl81xx sis900
|
||||
$(X86_ONLY)syskonnect usb_asix usb_ecm $(X86_ONLY)via_rhine
|
||||
$(X86_ONLY)syskonnect usb_davicom usb_asix usb_ecm $(X86_ONLY)via_rhine
|
||||
$(X86_ONLY)vt612x wb840
|
||||
|
||||
# WLAN drivers
|
||||
@@ -184,10 +184,10 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
|
||||
$(X86_ONLY)iprowifi4965 $(X86_ONLY)marvell88w8363 $(X86_ONLY)marvell88w8335
|
||||
$(X86_ONLY)ralink2860 $(X86_ONLY)ralinkwifi $(X86_ONLY)wavelanwifi
|
||||
|
||||
# WiMAX drivers
|
||||
$(GPL_ONLY)usb_beceemwmx
|
||||
# WWAN drivers
|
||||
#$(GPL_ONLY)usb_beceemwmx
|
||||
;
|
||||
#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
|
||||
SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
|
||||
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
|
||||
$(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
|
||||
;
|
||||
@@ -307,8 +307,7 @@ AddFilesToHaikuImage system : haiku_loader ;
|
||||
|
||||
# decorators
|
||||
AddDirectoryToHaikuImage home config add-ons decorators ;
|
||||
AddFilesToHaikuImage home config add-ons decorators :
|
||||
MacDecorator WinDecorator ClassicBe SATDecorator ;
|
||||
#AddFilesToHaikuImage home config add-ons decorators : ;
|
||||
|
||||
# create directories that will remain empty
|
||||
AddDirectoryToHaikuImage common cache tmp ;
|
||||
@@ -413,7 +412,7 @@ UserBuildConfigRulePreImage ;
|
||||
HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ;
|
||||
HAIKU_IMAGE_DIR ?= $(HAIKU_DEFAULT_IMAGE_DIR) ;
|
||||
HAIKU_IMAGE = $(HAIKU_IMAGE_NAME) ;
|
||||
HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 230 MB
|
||||
HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 300 MB
|
||||
HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ;
|
||||
MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ;
|
||||
|
||||
|
||||
+52
-4
@@ -42,7 +42,7 @@ AddFilesToPackage add-ons kernel busses scsi : ahci ;
|
||||
AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci ;
|
||||
AddFilesToPackage add-ons kernel console : vga_text ;
|
||||
AddFilesToPackage add-ons kernel debugger
|
||||
: <kdebug>demangle $(X86_ONLY)<kdebug>disasm
|
||||
: <kdebug>demangle $(X86_ONLY)<kdebug>disasm <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
|
||||
@@ -79,7 +79,7 @@ AddDriversToPackage input : ps2_hid usb_hid wacom ;
|
||||
AddDriversToPackage misc : <driver>poke <driver>mem ;
|
||||
AddDriversToPackage net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
|
||||
AddDriversToPackage ports : usb_serial ;
|
||||
#AddDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
|
||||
AddDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
|
||||
|
||||
# kernel
|
||||
AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ;
|
||||
@@ -215,10 +215,54 @@ AddSymlinkToPackage data Keymaps : Swedish : Finnish ;
|
||||
AddSymlinkToPackage data Keymaps : Slovene : Croatian ;
|
||||
AddSymlinkToPackage data Keymaps : US-International : Brazilian ;
|
||||
|
||||
# Copy keyboard layout files to the image one-by-one.
|
||||
local keyboardLayoutsDir
|
||||
= [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ;
|
||||
local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
|
||||
AddFilesToPackage data KeyboardLayouts : $(keyboardLayouts) ;
|
||||
local keyboardLayoutFiles =
|
||||
"Generic 104-key"
|
||||
"Generic 105-key International"
|
||||
"Kinesis Advantage"
|
||||
"Kinesis Ergo Elan International"
|
||||
"TypeMatrix 2030" ;
|
||||
keyboardLayoutFiles = $(keyboardLayoutFiles:G=keyboard-layout) ;
|
||||
SEARCH on $(keyboardLayoutFiles) = $(keyboardLayoutsDir) ;
|
||||
AddFilesToPackage data KeyboardLayouts
|
||||
: $(keyboardLayoutFiles) ;
|
||||
|
||||
# Add Apple Aluminum keyboard layout files to the image in an Apple Aluminum
|
||||
# subdirectory. The subdirectory is turned into a submenu in the Layout menu
|
||||
# of the Keymap preference app.
|
||||
local appleAluminumDir
|
||||
= [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts
|
||||
Apple\ Aluminum ] ;
|
||||
local appleAluminumFiles =
|
||||
"Apple Aluminium Extended International"
|
||||
"Apple Aluminium International"
|
||||
"Apple Aluminum (US)"
|
||||
"Apple Aluminum Extended (US)" ;
|
||||
appleAluminumFiles = $(appleAluminumFiles:G=keyboard-layout) ;
|
||||
SEARCH on $(appleAluminumFiles) = $(appleAluminumDir) ;
|
||||
AddFilesToPackage data KeyboardLayouts Apple\ Aluminum
|
||||
: $(appleAluminumFiles) ;
|
||||
|
||||
# Add ThinkPad keyboard layout files to the image in a ThinkPad
|
||||
# subdirectory. The subdirectory is turned into a submenu in the Layout menu
|
||||
# of the Keymap preference app.
|
||||
local thinkpadDir
|
||||
= [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ThinkPad ] ;
|
||||
local thinkPadFiles =
|
||||
"ThinkPad (US)"
|
||||
"ThinkPad International"
|
||||
"ThinkPad T400s (US)"
|
||||
"ThinkPad T400s International"
|
||||
"ThinkPad X1 (US)"
|
||||
"ThinkPad X1 International"
|
||||
"ThinkPad X100e (US)"
|
||||
"ThinkPad X100e International" ;
|
||||
thinkPadFiles = $(thinkPadFiles:G=keyboard-layout) ;
|
||||
SEARCH on $(thinkPadFiles) = $(thinkpadDir) ;
|
||||
AddFilesToPackage data KeyboardLayouts ThinkPad
|
||||
: $(thinkPadFiles) ;
|
||||
|
||||
# boot loader
|
||||
AddFilesToPackage : haiku_loader ;
|
||||
@@ -402,6 +446,8 @@ HaikuPackage $(haikuUserGuidePackage) ;
|
||||
|
||||
CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs userguide ]
|
||||
: userguide : -x .svn ;
|
||||
SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||
AddFilesToPackage bin : userguide ;
|
||||
|
||||
BuildHaikuPackage $(haikuUserGuidePackage) : haiku-userguide ;
|
||||
|
||||
@@ -414,6 +460,8 @@ HaikuPackage $(haikuWelcomePackage) ;
|
||||
|
||||
CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ]
|
||||
: welcome : -x .svn ;
|
||||
SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||
AddFilesToPackage bin : welcome ;
|
||||
|
||||
BuildHaikuPackage $(haikuWelcomePackage) : haiku-welcome ;
|
||||
|
||||
|
||||
@@ -1414,7 +1414,11 @@ actions BuildCDBootPPCImage1 bind MAPS
|
||||
# -hfs -hfs-bless .
|
||||
mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \
|
||||
-V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot \
|
||||
ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
|
||||
ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd \
|
||||
|| \
|
||||
genisoimage -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \
|
||||
-V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot \
|
||||
ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
|
||||
#$(RM) -R $(HAIKU_OUTPUT_DIR)/cd
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
|
||||
}
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc4-2011-05-20.zip ;
|
||||
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc4-2011-09-08.zip ;
|
||||
} else {
|
||||
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-1-x86_gcc2.hpkg ;
|
||||
}
|
||||
@@ -56,40 +56,17 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
|
||||
# ICU
|
||||
|
||||
# Note ICU isn't actually optional, but is still an external package
|
||||
HAIKU_ICU_GCC_2_PACKAGE = icu-4.4.1-r1a3-x86-gcc2-2011-05-29.hpkg ;
|
||||
HAIKU_ICU_GCC_4_PACKAGE = icu-4.4.1-r1a3-x86-gcc4-2011-05-29.zip ;
|
||||
HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-1-x86_gcc2.hpkg ;
|
||||
HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-11-02.zip ;
|
||||
# TODO: Make hpkg!
|
||||
HAIKU_ICU_PPC_PACKAGE = icu-4.4.1-ppc-2010-08-17.zip ;
|
||||
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.4.1-1-any.hpkg ;
|
||||
HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ;
|
||||
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-1-any.hpkg ;
|
||||
|
||||
if $(TARGET_ARCH) = ppc {
|
||||
local icu_package = $(HAIKU_ICU_PPC_PACKAGE) ;
|
||||
local zipFile = [ DownloadFile $(icu_package)
|
||||
: $(baseURL)/$(icu_package) ] ;
|
||||
|
||||
# zip file and output directory
|
||||
HAIKU_ICU_ZIP_FILE = $(zipFile) ;
|
||||
HAIKU_ICU_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
|
||||
$(icu_package:B) ] ;
|
||||
|
||||
# extract libraries
|
||||
HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR)
|
||||
:
|
||||
libicudata.so.44.1
|
||||
libicui18n.so.44.1
|
||||
libicuio.so.44.1
|
||||
libicule.so.44.1
|
||||
libiculx.so.44.1
|
||||
libicutu.so.44.1
|
||||
libicuuc.so.44.1
|
||||
: $(zipFile)
|
||||
: extracted-icu
|
||||
] ;
|
||||
} else if $(TARGET_ARCH) != x86 {
|
||||
Echo "ICU not available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
|
||||
local icu_package ;
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
if $(TARGET_ARCH) = ppc {
|
||||
icu_package = $(HAIKU_ICU_PPC_PACKAGE) ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
icu_package = $(HAIKU_ICU_GCC_2_PACKAGE) ;
|
||||
} else {
|
||||
icu_package = $(HAIKU_ICU_GCC_4_PACKAGE) ;
|
||||
@@ -104,18 +81,35 @@ if $(TARGET_ARCH) = ppc {
|
||||
$(icu_package:B) ] ;
|
||||
|
||||
# extract libraries
|
||||
HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR)
|
||||
:
|
||||
lib/libicudata.so.44
|
||||
lib/libicui18n.so.44
|
||||
lib/libicuio.so.44
|
||||
lib/libicule.so.44
|
||||
lib/libiculx.so.44
|
||||
lib/libicutu.so.44
|
||||
lib/libicuuc.so.44
|
||||
: $(packageFile)
|
||||
: extracted-icu
|
||||
] ;
|
||||
if $(TARGET_ARCH) = ppc {
|
||||
HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR)
|
||||
:
|
||||
libicudata.so.48.1
|
||||
libicui18n.so.48.1
|
||||
libicuio.so.48.1
|
||||
libicule.so.48.1
|
||||
libiculx.so.48.1
|
||||
libicutu.so.48.1
|
||||
libicuuc.so.48.1
|
||||
: $(packageFile)
|
||||
: extracted-icu
|
||||
] ;
|
||||
} else {
|
||||
HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR)
|
||||
:
|
||||
lib/libicudata.so.48.1.1
|
||||
lib/libicui18n.so.48.1.1
|
||||
lib/libicuio.so.48.1.1
|
||||
lib/libicule.so.48.1.1
|
||||
lib/libiculx.so.48.1.1
|
||||
lib/libicutu.so.48.1.1
|
||||
lib/libicuuc.so.48.1.1
|
||||
: $(packageFile)
|
||||
: extracted-icu
|
||||
] ;
|
||||
}
|
||||
} else {
|
||||
Echo "ICU not available for $(TARGET_ARCH)" ;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -45,8 +45,8 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
|
||||
dumb-0.9.3-x86-r1a3-x86-gcc2-2011-05-19.zip
|
||||
: $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc2-2011-05-19.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
jgmod-0.99-r1a3-x86-gcc2-2011-05-26.zip
|
||||
: $(baseURL)/lib/jgmod-0.99-r1a3-x86-gcc2-2011-05-26.zip ;
|
||||
jgmod-0.99-x86-gcc2-2011-08-02.zip
|
||||
: $(baseURL)/lib/jgmod-0.99-x86-gcc2-2011-08-02.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -224,8 +224,8 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
|
||||
guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip
|
||||
: $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-gfx-2.0.20-r1a3-x86-gcc4-2011-05-26.zip
|
||||
: $(baseURL)/lib/sdl-gfx-r1a3-x86-gcc4-2011-05-26.zip ;
|
||||
sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip
|
||||
: $(baseURL)/lib/sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip
|
||||
: $(baseURL)/lib/sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip ;
|
||||
|
||||
@@ -33,6 +33,7 @@ OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL
|
||||
OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ;
|
||||
OptionalPackageDependencies Vim : GetText LibIconv ;
|
||||
OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ;
|
||||
OptionalPackageDependencies wpa_supplicant : OpenSSL ;
|
||||
OptionalPackageDependencies XZ-Utils : Tar ;
|
||||
|
||||
OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
|
||||
|
||||
+41
-14
@@ -81,7 +81,8 @@
|
||||
# Welcome - introductory documentation to Haiku
|
||||
# WifiFirmwareScriptData - data files needed by install-wifi-firmwares.sh
|
||||
# WonderBrush - native graphics application
|
||||
# WQY-MicroHei - Chinese font
|
||||
# wpa_supplicant - a WPA Supplicant with support for WPA and WPA2
|
||||
# WQY-MicroHei - Chinese font
|
||||
# XZ-Utils - file archiving utility
|
||||
# Yasm - the assembler utility
|
||||
|
||||
@@ -618,6 +619,22 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
|
||||
}
|
||||
|
||||
|
||||
# DMIDecode
|
||||
if [ IsOptionalHaikuImagePackageAdded DMIDecode ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package DMIDecode available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
dmidecode-2.11-x86-gcc4-2011-11-02.zip
|
||||
: http://revolf.free.fr/beos/dmidecode-2.11-x86-gcc4-2011-11-02.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
dmidecode-2.11-x86-gcc2-2011-11-02.zip
|
||||
: http://revolf.free.fr/beos/dmidecode-2.11-x86-gcc2-2011-11-02.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Doxygen
|
||||
if [ IsOptionalHaikuImagePackageAdded Doxygen ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
@@ -678,10 +695,6 @@ if [ IsOptionalHaikuImagePackageAdded Fastdep ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded friss ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package friss available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip
|
||||
: $(baseURL)/friss-0.5pre7-x86-gcc4.zip
|
||||
: : true ;
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
@@ -807,7 +820,7 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
|
||||
local arch = $(TARGET_ARCH) ;
|
||||
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
|
||||
for abiVersionedLib in $(HAIKU_ICU_LIBS) {
|
||||
abiVersionedLib = $(abiVersionedLib:G=) ;
|
||||
abiVersionedLib = $(abiVersionedLib:B:G=) ;
|
||||
local lib = $(abiVersionedLib:B) ;
|
||||
AddSymlinkToHaikuImage develop abi $(arch) $(abi) lib
|
||||
: /system/lib $(abiVersionedLib) ;
|
||||
@@ -1144,8 +1157,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
openssh-5.9p1-x86-gcc4-2011-09-08.zip
|
||||
: $(baseURL)/openssh-5.9p1-x86-gcc4-2011-09-08.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
openssh-5.8p2-1-x86_gcc2.hpkg
|
||||
@@ -1382,8 +1395,8 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
subversion-1.6.15-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/subversion-1.6.15-r1a3-x86-gcc4-2011-05-24.zip
|
||||
subversion-1.6.17-x86-gcc4-2011-08-03.zip
|
||||
: $(baseURL)/subversion-1.6.17-x86-gcc4-2011-08-03.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
@@ -1582,11 +1595,9 @@ if [ IsOptionalHaikuImagePackageAdded Welcome ] {
|
||||
AddFilesToHaikuImage system packages : haiku-userguide.hpkg ;
|
||||
AddFilesToHaikuImage system packages : haiku-welcome.hpkg ;
|
||||
|
||||
AddSymlinkToHaikuImage home Desktop
|
||||
: /boot/system/documentation/welcome/welcome_en.html
|
||||
AddSymlinkToHaikuImage home Desktop : /boot/system/bin/welcome
|
||||
: Welcome ;
|
||||
AddSymlinkToHaikuImage home Desktop
|
||||
: /boot/system/documentation/userguide/en/contents.html
|
||||
AddSymlinkToHaikuImage home Desktop : /boot/system/bin/userguide
|
||||
: User\ Guide ;
|
||||
}
|
||||
|
||||
@@ -1659,6 +1670,22 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
|
||||
}
|
||||
|
||||
|
||||
# wpa_supplicant
|
||||
if [ IsOptionalHaikuImagePackageAdded wpa_supplicant ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package wpa_supplicant available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
wpa_supplicant-0.7.3-x86-gcc4-2011-10-05.zip
|
||||
: $(baseURL)/wpa_supplicant-0.7.3-x86-gcc4-2011-10-05.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
wpa_supplicant-0.7.3-x86-gcc2-2011-10-05.zip
|
||||
: $(baseURL)/wpa_supplicant-0.7.3-x86-gcc2-2011-10-05.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# WQY-MicroHei
|
||||
if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] {
|
||||
InstallOptionalHaikuImagePackage
|
||||
|
||||
@@ -16,7 +16,7 @@ switch $(HAIKU_BUILD_PROFILE) {
|
||||
HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
|
||||
AddGroupToHaikuImage party : 101 : user sshd ;
|
||||
HAIKU_IMAGE_HOST_NAME = shredder ;
|
||||
HAIKU_IMAGE_SIZE = 690 ;
|
||||
HAIKU_IMAGE_SIZE = 750 ;
|
||||
HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
|
||||
|
||||
AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates
|
||||
|
||||
@@ -27,3 +27,8 @@
|
||||
|
||||
# Add the optional package WonderBrush to the image.
|
||||
#AddOptionalHaikuImagePackages WonderBrush ;
|
||||
|
||||
# Add an example optional gfx driver and its accelerant.
|
||||
# (Drivers just have a special rule because of the need for the symlink in dev/)
|
||||
#AddDriversToHaikuImage graphics : optional_driver ;
|
||||
#AddFilesToHaikuImage system add-ons accelerants : optional_driver.accelerant ;
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
# parameters <haiku sourcedir> <buildtools dir> <haiku output dir>
|
||||
# Parameters <haiku sourcedir> <buildtools dir> <haiku output dir>
|
||||
# Influential environmental variable:
|
||||
# * haikuRequiredLegacyGCCVersion: The requrired version of the gcc. Will be
|
||||
# checked against the version in the buildtools directory.
|
||||
|
||||
# get and check the parameters
|
||||
if [ $# -lt 3 ]; then
|
||||
@@ -19,21 +22,37 @@ additionalMakeArgs=$*
|
||||
|
||||
|
||||
if [ ! -d $haikuSourceDir ]; then
|
||||
echo "No such directory: \"$haikuSourceDir\"" >&2
|
||||
echo "ERROR: No such directory: \"$haikuSourceDir\"" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d $buildToolsDir ]; then
|
||||
echo "No such directory: \"$buildToolsDir\"" >&2
|
||||
echo "ERROR: No such directory: \"$buildToolsDir\"" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! grep "$haikuRequiredLegacyGCCVersion" \
|
||||
$buildToolsDir/gcc/gcc/version.c >/dev/null 2>&1 ; then
|
||||
echo "*** Mismatching compiler versions between configure script and" >&2
|
||||
echo "*** $buildToolsDir/gcc/gcc/version.c" >&2
|
||||
echo "*** Did you perhaps update only one of haiku & buildtools?" >&2
|
||||
exit 1
|
||||
# verify or extract the gcc version
|
||||
gccVersionDotC="$buildToolsDir/gcc/gcc/version.c"
|
||||
if [ -n "$haikuRequiredLegacyGCCVersion" ]; then
|
||||
# haikuRequiredLegacyGCCVersion has been specified. Check whether the
|
||||
# version of the gcc in the given build tools directory matches.
|
||||
if ! grep "$haikuRequiredLegacyGCCVersion" \
|
||||
"$gccVersionDotC" >/dev/null 2>&1 ; then
|
||||
echo "*** Mismatching compiler versions between configure script and" \
|
||||
>&2
|
||||
echo "*** $gccVersionDotC" >&2
|
||||
echo "*** Did you perhaps update only one of haiku & buildtools?" >&2
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
# haikuRequiredLegacyGCCVersion wasn't specified. Extract the version string
|
||||
# from the gcc's version.c.
|
||||
haikuRequiredLegacyGCCVersion=`grep "2.95.3-haiku-" "$gccVersionDotC" \
|
||||
| sed 's@.*\"\(.*\)\".*@\1@'`
|
||||
if [ -z "$haikuRequiredLegacyGCCVersion" ]; then
|
||||
echo "ERROR: Failed to extract version string from $gccVersionDotC" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@@ -86,6 +86,12 @@ if [ -z "$gccVersion" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# touch all info files in order to avoid the dependency on makeinfo
|
||||
# (which apparently doesn't work reliably on all the different host
|
||||
# configurations and changes files which in turn appear as local changes
|
||||
# to the VCS).
|
||||
find $binutilsSourceDir -name \*.info -print0 | xargs -0 touch
|
||||
find $gccSourceDir -name \*.info -print0 | xargs -0 touch
|
||||
|
||||
# create the object and installation directories for the cross compilation tools
|
||||
installDir=$haikuOutputDir/cross-tools
|
||||
|
||||
Reference in New Issue
Block a user