Merge branch 'master' into package-management

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
2013-05-05 15:03:26 +02:00
parent 0d6e950639 1a84d6b362
commit 25a7b01d15
15096 changed files with 647420 additions and 1619850 deletions
@@ -96,6 +96,12 @@ fi
 # We must wait for the app_server and registrar to be ready
 launch $SERVERS/registrar _roster_thread_	# launch registrar

+# If app_server doesn't exist, just run consoled.
+if [ ! -f "/boot/$SERVERS/app_server" ]; then
+	/bin/consoled
+	exit
+fi
+
 launch $SERVERS/debug_server				# launch debug_server

 launch $SERVERS/package_daemon
@@ -105,7 +111,7 @@ if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/net_server				# launch net_server
 fi

-launch $SERVERS/app_server picasso		# launch app_server
+launch $SERVERS/app_server picasso			# launch app_server

 if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/syslog_daemon
@@ -113,14 +119,15 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi

 # Now ask the user if he wants to run the Installer or continue to the Desktop.
-if [ "$isReadOnly" = "yes" ]; then
-	# Create Installer link (using the write overlay)
-	ln -sf /boot/system/apps/Installer /boot/home/Desktop/Installer
-
-	/bin/ReadOnlyBootPrompt
+localeSettings=/boot/home/config/settings/Locale\ settings
+if [ "$isReadOnly" = "yes" -o ! -e "$localeSettings" ]; then
+	/bin/FirstBootPrompt
 	if [ $? -eq 0 ]; then
 		launchscript $SCRIPTS/Bootscript.cd
 		exit 0 # and return
+	elif [ "$isReadOnly" = "yes" ] ; then
+		# Create Installer link (using the write overlay)
+		ln -sf /boot/system/apps/Installer /boot/home/Desktop/Installer
 	fi
 fi

@@ -185,8 +192,8 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi

 # Check for fresh install and run post install scripts.
-postInstallDir=boot/post_install
 freshInstallIndicator=/boot/common/settings/fresh_install
+postInstallDir=boot/post_install
 if [ -e $freshInstallIndicator ]; then
 	# wait a moment for things to calm down a bit
 	sleep 3
@@ -16,7 +16,7 @@ BeMac|BeBox)
 	BE_HOST_CPU=ppc
 	;;
 *)
-	BE_HOST_CPU=unknown
+	BE_HOST_CPU=`uname -m`
 esac

 # not used by Haiku, but by (legacy) applications (e.g. Pe)
@@ -38,6 +38,14 @@ else
 	export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
 fi

+# Locale
+export LC_MESSAGES=`locale -m`
+export LC_NUMERIC=`locale -f`
+export LC_TIME=`locale -t`
+export LC_COLLATE=$LC_MESSAGES
+export LC_CTYPE=$LC_MESSAGES
+export LC_MONETARY=$LC_NUMERIC
+
 # media kit
 if [ -f $HOME/config/settings/use_old_audio ]
 then
@@ -15,12 +15,14 @@ $f = 10,20
 $two = 20,10

 # Key rows
-[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 10,6:+4; ]
-[ 0,6; 4,5:-; :0x11+12; d$back:+; $b:-; :-; d:0x20; d:+1; $b:-; d:+1; d:0x6a; d:0x23+1 ]
-[ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ]
+[ 0,0;  4,5:-; $fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 
+	10,6:+4; ]
+[ 0,6; 4,5:-; :0x11+12; $back:+; $b:-; :-; :0x20; :+1; $b:-; :+1; :0x6a; 
+	:0x23+1 ]
+[ 0,16; 4,5:-; $d:0x26; :+12; $e:0x47; $b:-; :0x34-0x36; $b:-; :+3; :0x25 ]
 [ 0,26; 4,5:led-caps; # integrated into caps key
-	d17,10:0x3b; :+11; :0x33; 50,10:-; :0x48-0x4a; d:0x3a ]
-[ 0,36; 4,5:-; d$lshift:0x4b; :0x69; :0x4c+9; d24,10:+1; 15,10:-; d:+1; 
-	15,10:-; :+3; d$f:+1 ]
-[ 0,46; 4,5:-; d$ctrl:0x5c; d$alt:0x5d; d$cmd:0x66; 67,10:0x5e; d$cmd:0x67;
-	d$alt:0x5f; d$ctrl:0x60; $b:-; d:+3; $b:-; $two:+1; :+1 ]
+	17,10:0x3b; :+11; :0x33; 50,10:-; :0x48-0x4a; :0x3a ]
+[ 0,36; 4,5:-; $lshift:0x4b; :0x69; :0x4c+9; 24,10:+1; 15,10:-; :+1; 
+	15,10:-; :+3; $f:+1 ]
+[ 0,46; 4,5:-; $ctrl:0x5c; $alt:0x5d; $cmd:0x66; 67,10:0x5e; $cmd:0x67; 
+	$alt:0x5f; $ctrl:0x60; $b:-; :+3; $b:-; $two:+1; :+1 ]
@@ -15,13 +15,13 @@ $cmd = 14,12
 $arrow = 10,6

 # Key rows
-[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; ]
-[ 0,6;  4,5:-; :0x11+12; d$back:+; ]
-[ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; ]
+[ 0,0;  4,5:-; $fn:0x01; $fn:+12; ]
+[ 0,6;  4,5:-; :0x11+12; $back:+; ]
+[ 0,16; 4,5:-; $d:0x26; :+12; $e:0x47; ]
 [ 0,26; 4,5:led-caps; # integrated into caps key
-	d17,10:0x3b; :+11; :0x33; ]
-[ 0,36; 4,5:-; d$lshift:0x4b; :0x69; :0x4c+9; d24,10:+1; ]
-[ 0,46; 4,5:-; d$last:-; # fn key
-	d$last:0x5c; d$last:0x5d; d$cmd:0x66; 49,12:0x5e; d$cmd:0x67;
-	d$last:0x5f; $arrow:-; d$arrow:0x57; $arrow:-; ]
-[ 121,52; d$arrow:0x61+2; ]
+	17,10:0x3b; :+11; :0x33; ]
+[ 0,36; 4,5:-; $lshift:0x4b; :0x69; :0x4c+9; 24,10:+1; ]
+[ 0,46; 4,5:-; $last:-; # fn key
+	$last:0x5c; $last:0x5d; $cmd:0x66; 49,12:0x5e; $cmd:0x67; 
+	$last:0x5f; $arrow:-; $arrow:0x57; $arrow:-; ]
+[ 121,52; $arrow:0x61+2; ]
@@ -12,13 +12,13 @@ $cmd = 14,12
 $arrow = 10,6

 # Key rows
-[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; ]
-[ 0,6;  4,5:-; :0x11+12; d$back:+; ]
-[ 0,16; 4,5:-; d17,10:0x26; :+13; ]
+[ 0,0;  4,5:-; $fn:0x01; $fn:+12; ]
+[ 0,6;  4,5:-; :0x11+12; $back:+; ]
+[ 0,16; 4,5:-; 17,10:0x26; :+13; ]
 [ 0,26; 4,5:led-caps; # integrated into caps key
-	d19,10:0x3b; :+11; d18,10:0x47; ]
-[ 0,36; 4,5:-; d24,10:0x4b; :+10; d23,10:+1; ]
-[ 0,46; 4,5:-; d$last:-; # fn key
-	d$last:0x5c; d$last:0x5d; d$cmd:0x66; 49,12:0x5e; d$cmd:0x67;
-	d$last:0x5f; $arrow:-; d$arrow:0x57; $arrow:-; ]
-[ 121,52; d$arrow:0x61+2; ]
+	19,10:0x3b; :+11; 18,10:0x47; ]
+[ 0,36; 4,5:-; 24,10:0x4b; :+10; 23,10:+1; ]
+[ 0,46; 4,5:-; $last:-; # fn key
+	$last:0x5c; $last:0x5d; $cmd:0x66; 49,12:0x5e; $cmd:0x67; 
+	$last:0x5f; $arrow:-; $arrow:0x57; $arrow:-; ]
+[ 121,52; $arrow:0x61+2; ]
@@ -13,11 +13,15 @@ $f = 10,20
 $two = 20,10

 # Key rows
-[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 10,6:+4; ]
-[ 0,6;  4,5:-; :0x11+12; d$back:+; $b:-; :-; d:0x20; d:+1; $b:-; d:+1; d:0x6a; d:0x23+1 ]
-[ 0,16; 4,5:-; 0,16; 4,5:-; d17,10:0x26; :+13; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ]
+[ 0,0;  4,5:-; $fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 
+	10,6:+4; ]
+[ 0,6;  4,5:-; :0x11+12; $back:+; $b:-; :-; :0x20; :+1; $b:-; :+1; :0x6a; 
+	:0x23+1 ]
+[ 0,16; 4,5:-; 0,16; 4,5:-; 17,10:0x26; :+13; $b:-; :0x34-0x36; $b:-; :+3; 
+	:0x25 ]
 [ 0,26; 4,5:led-caps; # integrated into caps key
-	d19,10:0x3b; :+11; d18,10:0x47; 40,10:-; :0x48-0x4a; d:0x3a ]
-[ 0,36; 4,5:-; d24,10:0x4b; :+10; d23,10:+1; 15,10:-; d:+1; 15,10:-; :+3; d$f:+1 ]
-[ 0,46; 4,5:-; d$ctrl:0x5c; d$alt:0x5d; d$cmd:0x66; 67,10:0x5e; d$cmd:0x67;
-	d$alt:0x5f; d$ctrl:0x60; $b:-; d:+3; $b:-; $two:+1; :+1 ]
+	19,10:0x3b; :+11; 18,10:0x47; 40,10:-; :0x48-0x4a; :0x3a ]
+[ 0,36; 4,5:-; 24,10:0x4b; :+10; 23,10:+1; 15,10:-; :+1; 15,10:-; :+3; 
+	$f:+1 ]
+[ 0,46; 4,5:-; $ctrl:0x5c; $alt:0x5d; $cmd:0x66; 67,10:0x5e; $cmd:0x67; 
+	$alt:0x5f; $ctrl:0x60; $b:-; :+3; $b:-; $two:+1; :+1 ]
@@ -0,0 +1,2 @@
+Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/