Initial changes to remove /boot/common

* find_directory() and hard-coded paths use /boot/system instead of
  /boot/common.
* The build system creates the writable directories in /boot/system
  instead of /boot/common.
* The build system no longer installs any packages in /boot/common.

Jamfile

@@ -17,8 +17,6 @@ if ! $(HAIKU_BOOTSTRAP_BUILD) {
 	AddHaikuImagePackages
 		bzip2 ctags ffmpeg freetype glu grep icu jpeg libpng libsolv mesa sed
 		tar zlib
-		:
-		system
 		;
 
 	# secondary architectures
@@ -28,8 +26,6 @@ if ! $(HAIKU_BOOTSTRAP_BUILD) {
 		on $(architectureObject) {
 			AddHaikuImagePackages
 				ffmpeg freetype glu icu jpeg libpng libsolv mesa zlib
-				:
-				system
 				;
 		}
 	}

build/jam/DefaultBuildProfiles

@@ -35,12 +35,6 @@ rule DefineDefaultBuildProfiles
 			HAIKU_IMAGE_HOST_NAME = shredder ;
 			HAIKU_IMAGE_SIZE = 800 ;
 
-			AddHaikuImagePackages
-				wpa_supplicant
-				:
-				system
-				;
-
 			AddHaikuImagePackages
 				bepdf
 				cvs
@@ -56,6 +50,7 @@ rule DefineDefaultBuildProfiles
 				timgmsoundfont
 				vision
 				wonderbrush
+				wpa_supplicant
 				wqy_microhei
 				xz_utils@!gcc2
 				;
@@ -72,7 +67,7 @@ rule DefineDefaultBuildProfiles
 			local architectureObject ;
 			for architectureObject in [ MultiArchSubDirSetup ] {
 				on $(architectureObject) {
-					AddHaikuImagePackages openssl : system ;
+					AddHaikuImagePackages openssl ;
 				}
 			}
 
@@ -92,20 +87,15 @@ rule DefineDefaultBuildProfiles
 			HAIKU_IMAGE_HOST_NAME = shredder ;
 			HAIKU_IMAGE_SIZE = 600 ;
 
-			AddHaikuImagePackages
-				openssl
-				wpa_supplicant
-				:
-				system
-				;
-
 			AddHaikuImagePackages
 				man
 				nano
 				openssh
+				openssl
 				p7zip
 				pe
 				vision
+				wpa_supplicant
 				xz_utils
 				;
 
@@ -117,41 +107,31 @@ rule DefineDefaultBuildProfiles
 			HAIKU_IMAGE_HOST_NAME = shredder ;
 			HAIKU_IMAGE_SIZE = 20000 ;
 
-			AddHaikuImagePackages
-				curl
-				curl_devel
-				freetype
-				freetype_devel
-				grep
-				icu
-				libsolv
-				ncurses
-				ncurses_devel
-				sed
-				zlib
-				zlib_devel
-				:
-				system
-				;
-
 			AddHaikuImagePackages
 				autoconf
 				automake
 				binutils
 				bison
+				curl
+				curl_devel
 				flex
+				freetype
+				freetype_devel
 				gcc
+				grep
 				haikuporter
-#				jam
+				icu
+				libsolv
 				libtool
 				libtool_libltdl
 				m4
 				make
-#				makeinfo
+				ncurses
-#				mkdepend
+				ncurses_devel
-#				perl
 				python
-#				texinfo
+				sed
+				zlib
+				zlib_devel
 				;
 
 			# secondary architecture packages
@@ -160,23 +140,18 @@ rule DefineDefaultBuildProfiles
 					in [ MultiArchSubDirSetup $(TARGET_PACKAGING_ARCHS[2-]) ] {
 				on $(architectureObject) {
 					AddHaikuImagePackages
+						binutils
 						curl
 						curl_devel
 						freetype
 						freetype_devel
+						gcc
 						icu
 						libsolv
 						ncurses
 						ncurses_devel
 						zlib
 						zlib_devel
-						:
-						system
-						;
-
-					AddHaikuImagePackages
-						binutils
-						gcc
 						;
 				}
 			}

build/jam/ImageRules

@@ -840,28 +840,14 @@ rule AddPackagesAndRepositoryVariablesToContainerScript script : container
 	AddVariableToScript $(script) : resolvePackageDependencies
 		: $(resolvePackageDependencies) ;
 
-	# Add variables "systemPackages" and "commonPackages" with the packages
+	# Add variable "systemPackages"  with the packages copied/updated.
-	# copied/updated.
 	local allPackages = [ on $(container) return $(HAIKU_PACKAGES_IN_IMAGE) ] ;
 	if $(updateOnly) && ! [ IncludeAllTargetsInContainer $(container) ] {
 		allPackages = [ FilterContainerUpdateTargets $(allPackages)
 			: [ on $(container) return $(HAIKU_INCLUDE_IN_CONTAINER_VAR) ] ] ;
 	}
 
-	local systemPackages ;
+	AddTargetVariableToScript $(script) : $(allPackages) : systemPackages ;
-	local commonPackages ;
-	local package ;
-	for package in $(allPackages) {
-		if [ on $(package) return $(HAIKU_PACKAGE_INSTALLATION_LOCATION) ]
-				= system {
-			systemPackages += $(package) ;
-		} else {
-			commonPackages += $(package) ;
-		}
-	}
-
-	AddTargetVariableToScript $(script) : $(systemPackages) : systemPackages ;
-	AddTargetVariableToScript $(script) : $(commonPackages) : commonPackages ;
 
 	# Generate the repository package lists and add variables for the
 	# repositories.
@@ -1052,14 +1038,10 @@ rule OptionalPackageDependencies package : dependencies
 }
 
 
-rule AddHaikuImagePackages packages : installationLocation
+rule AddHaikuImagePackages packages
 {
-	# AddHaikuImagePackages <packages> [ : <installationLocation> ] ;
+	# AddHaikuImagePackages <packages> ;
-	 # Adds the given package <packages>s to the image. <installationLocation>
+	# Adds the given packages <packages> to the image.
-	 # is either "system" or "common" (the default) and specifies where the
-	 # packages shall be installed.
-
-	installationLocation ?= common ;
 
 	packages = [ FFilterByBuildFeatures $(packages) ] ;
 
@@ -1083,7 +1065,7 @@ rule AddHaikuImagePackages packages : installationLocation
 				HAIKU_INCLUDE_IN_IMAGE on $(file) = 1 ;
 			}
 
-			AddPackageFilesToHaikuImage $(installationLocation) : $(file) ;
+			AddPackageFilesToHaikuImage system : $(file) ;
 		}
 	}
 }
@@ -1143,9 +1125,8 @@ rule InstallOptionalHaikuImagePackage url : dirTokens : flags
 	# TODO: Remove the non-hpkg cases!
 	# Currently the semantics differs depending on whether the  cdPackage flag
 	# has been specified and the type of the package file:
-	# * For a hpkg <dirTokens> is "common" (default) or "system" and specifies
+	# * For a hpkg <dirTokens> is ignored. The package will be copied into the
-	#   the installation location of the package (will be copied to the
+	#   system/packages directory.
-	#   packages/ subdirectory).
 	# * For a regular archive and cdPackage, <dirTokens> is ignored and
 	#   the package will be copied to the _package_ directory of the CD image.
 	# * For a regular archive and without cdPackage, <dirTokens> specifies the
@@ -1160,11 +1141,10 @@ rule InstallOptionalHaikuImagePackage url : dirTokens : flags
 	local archiveFile = [ DownloadFile $(package) : $(url) ] ;
 
 	if $(package:S) = .hpkg {
-		local location = $(dirTokens:E=common) ;
 		if $(HAIKU_UPDATE_ALL_PACKAGES) {
 			HAIKU_INCLUDE_IN_IMAGE on $(archiveFile) = 1 ;
 		}
-		AddPackageFilesToHaikuImage $(location) : $(archiveFile) ;
+		AddPackageFilesToHaikuImage system : $(archiveFile) ;
 	} else if cdPackage in $(flags) && $(HAIKU_CD_NAME) {
 		# TODO: If HAIKU_CD_NAME is set, that doesn't mean we're building a CD
 		# image!
@@ -1188,7 +1168,7 @@ rule AddEntryToHaikuImageUserGroupFile file : entry
 		Always $(file) ;
 		MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
 		BuildHaikuImageUserGroupFile $(file) ;
-		AddFilesToHaikuImage common settings etc : $(file) ;
+		AddFilesToHaikuImage system settings etc : $(file) ;
 	}
 
 	HAIKU_IMAGE_USER_GROUP_ENTRIES on $(file) = $(allEntries) ;

build/jam/OptionalPackages

@@ -34,7 +34,7 @@ local baseSourceURL = http://haiku-files.org/files/sources ;
 
 # BeBook
 if [ IsOptionalHaikuImagePackageAdded BeBook ] {
-	AddHaikuImagePackages be_book : system ;
+	AddHaikuImagePackages be_book ;
 	AddSymlinkToHaikuImage home Desktop
 		: /boot/system/documentation/BeBook/index.html
 		: BeBook ;
@@ -55,12 +55,12 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
 		AddSymlinkToHaikuImage beos : ../system/bin ;
 		AddSymlinkToHaikuImage beos
 			: ../system/documentation ;
-		AddSymlinkToHaikuImage beos : ../common/settings/etc ;
+		AddSymlinkToHaikuImage beos : ../system/settings/etc ;
 		AddSymlinkToHaikuImage beos : ../system/preferences ;
 		AddSymlinkToHaikuImage beos : ../system ;
 		AddDirectoryToHaikuImage var ;
-		AddSymlinkToHaikuImage var : /boot/common/var/log ;
+		AddSymlinkToHaikuImage var : /boot/system/var/log ;
-		AddSymlinkToHaikuImage var : /boot/common/cache/tmp ;
+		AddSymlinkToHaikuImage var : /boot/system/cache/tmp ;
 	}
 }
 
@@ -102,8 +102,8 @@ if [ IsOptionalHaikuImagePackageAdded Development ] {
 	local architectureObject ;
 	for architectureObject in [ MultiArchSubDirSetup ] {
 		on $(architectureObject) {
-			AddHaikuImagePackages curl_devel ffmpeg_devel freetype_devel glu_devel
+			AddHaikuImagePackages curl_devel ffmpeg_devel freetype_devel
-				jpeg_devel libpng_devel zlib_devel : system ;
+				glu_devel jpeg_devel libpng_devel zlib_devel ;
 		}
 	}
 }
@@ -145,8 +145,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
 		:
 		haiku_devel.hpkg
 		haiku_$(TARGET_PACKAGING_ARCHS[2-])_devel.hpkg
+		makefile_engine.hpkg
 		;
-	AddPackageFilesToHaikuImage common : makefile_engine.hpkg ;
 }
 
 

build/jam/images/HaikuImage

@@ -259,22 +259,22 @@ local etcFiles = inputrc profile ;
 etcFiles = $(etcFiles:G=etc) ;
 SEARCH on $(etcFiles) = $(etcDir) ;
 etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
-AddFilesToHaikuImage common settings etc : $(etcFiles) ;
+AddFilesToHaikuImage system settings etc : $(etcFiles) ;
 
 local profileFiles = [ Glob $(etcDir)/profile.d : *.sh ] ;
 profileFiles = $(profileFiles:G=profile-d) ;
-AddDirectoryToHaikuImage common settings etc profile.d ;
+AddDirectoryToHaikuImage system settings etc profile.d ;
-AddFilesToHaikuImage common settings etc profile.d : $(profileFiles) ;
+AddFilesToHaikuImage system settings etc profile.d : $(profileFiles) ;
 
 #local bashCompletionFiles = [ Glob $(etcDir)/bash_completion.d : * ] ;
 #local bashCompletionHelperFiles
 #    = [ Glob $(etcDir)/bash_completion.d/helpers : * ] ;
 #bashCompletionFiles = $(bashCompletionFiles:G=bash-completion) ;
 #bashCompletionHelperFiles = $(bashCompletionHelperFiles:G=bash-completion-hlp) ;
-#AddDirectoryToHaikuImage common etc bash_completion.d ;
+#AddDirectoryToHaikuImage system etc bash_completion.d ;
-#AddDirectoryToHaikuImage common etc bash_completion.d helpers ;
+#AddDirectoryToHaikuImage system etc bash_completion.d helpers ;
-#AddFilesToHaikuImage common etc bash_completion.d : $(bashCompletionFiles) ;
+#AddFilesToHaikuImage system etc bash_completion.d : $(bashCompletionFiles) ;
-#AddFilesToHaikuImage common etc bash_completion.d helpers
+#AddFilesToHaikuImage system etc bash_completion.d helpers
 #    : $(bashCompletionHelperFiles) ;
 
 local driverSettingsFiles = <driver-settings>kernel ;
@@ -286,22 +286,22 @@ AddFilesToHaikuImage home config settings kernel drivers
 local networkSettingsFiles = <network-settings>services ;
 SEARCH on $(networkSettingsFiles)
 	= [ FDirName $(HAIKU_TOP) data settings network ] ;
-AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
+AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ;
 
 # fresh install indicator file for the post install scripts
 SEARCH on <post-install>fresh_install
-	= [ FDirName $(HAIKU_TOP) data common settings ] ;
+	= [ FDirName $(HAIKU_TOP) data system settings ] ;
-AddFilesToHaikuImage common settings : <post-install>fresh_install ;
+AddFilesToHaikuImage system settings : <post-install>fresh_install ;
 
 # decorators
 AddDirectoryToHaikuImage home config non-packaged add-ons decorators ;
 #AddFilesToHaikuImage home config add-ons decorators : ;
 
 # create directories that will remain empty
-AddDirectoryToHaikuImage common cache tmp ;
+AddDirectoryToHaikuImage system cache tmp ;
-AddDirectoryToHaikuImage common non-packaged ;
+AddDirectoryToHaikuImage system non-packaged ;
-AddDirectoryToHaikuImage common var empty ;
+AddDirectoryToHaikuImage system var empty ;
-AddDirectoryToHaikuImage common var log ;
+AddDirectoryToHaikuImage system var log ;
 AddDirectoryToHaikuImage home Desktop ;
 AddDirectoryToHaikuImage home mail ;
 AddDirectoryToHaikuImage home config packages ;
@@ -332,7 +332,7 @@ CopyDirectoryToHaikuImage home config settings Media
 # repository config files
 local repository ;
 for repository in $(HAIKU_REPOSITORIES) {
-	AddFilesToHaikuImage common settings package-repositories
+	AddFilesToHaikuImage system settings package-repositories
 		: [ on $(repository) return $(HAIKU_REPOSITORY_CONFIG_FILE) ]
 		: $(repository:G=) ;
 }

build/jam/images/HaikuImageBootstrap

@@ -215,12 +215,12 @@ local etcFiles = inputrc profile ;
 etcFiles = $(etcFiles:G=etc) ;
 SEARCH on $(etcFiles) = $(etcDir) ;
 etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
-AddFilesToHaikuImage common settings etc : $(etcFiles) ;
+AddFilesToHaikuImage system settings etc : $(etcFiles) ;
 
 local profileFiles = [ Glob $(etcDir)/profile.d : *.sh ] ;
 profileFiles = $(profileFiles:G=profile-d) ;
-AddDirectoryToHaikuImage common settings etc profile.d ;
+AddDirectoryToHaikuImage system settings etc profile.d ;
-AddFilesToHaikuImage common settings etc profile.d : $(profileFiles) ;
+AddFilesToHaikuImage system settings etc profile.d : $(profileFiles) ;
 
 local driverSettingsFiles = <driver-settings>kernel ;
 SEARCH on $(driverSettingsFiles)
@@ -231,18 +231,18 @@ AddFilesToHaikuImage home config settings kernel drivers
 local networkSettingsFiles = <network-settings>services ;
 SEARCH on $(networkSettingsFiles)
 	= [ FDirName $(HAIKU_TOP) data settings network ] ;
-AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
+AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ;
 
 # fresh install indicator file for the post install scripts
 SEARCH on <post-install>fresh_install
-	= [ FDirName $(HAIKU_TOP) data common settings ] ;
+	= [ FDirName $(HAIKU_TOP) data system settings ] ;
-AddFilesToHaikuImage common settings : <post-install>fresh_install ;
+AddFilesToHaikuImage system settings : <post-install>fresh_install ;
 
 # create directories that will remain empty
-AddDirectoryToHaikuImage common cache tmp ;
+AddDirectoryToHaikuImage system cache tmp ;
-AddDirectoryToHaikuImage common non-packaged ;
+AddDirectoryToHaikuImage system non-packaged ;
-AddDirectoryToHaikuImage common var empty ;
+AddDirectoryToHaikuImage system var empty ;
-AddDirectoryToHaikuImage common var log ;
+AddDirectoryToHaikuImage system var log ;
 AddDirectoryToHaikuImage home Desktop ;
 AddDirectoryToHaikuImage home mail ;
 AddDirectoryToHaikuImage home config packages ;

build/jam/images/HaikuImageCommon

@@ -28,7 +28,7 @@ if $(HAIKU_IMAGE_HOST_NAME) {
 	Always $(file) ;
 	MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
 	BuildHaikuImageHostnameFile $(file) ;
-	AddFilesToHaikuImage common settings network : $(file) ;
+	AddFilesToHaikuImage system settings network : $(file) ;
 }
 
 

build/jam/packages/Haiku

@@ -138,7 +138,7 @@ local postInstallFiles = add_catalog_entry_attributes.sh
 	default_deskbar_items.sh ;
 postInstallFiles = $(postInstallFiles:G=post-install) ;
 SEARCH on $(postInstallFiles)
-	= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
+	= [ FDirName $(HAIKU_TOP) data system boot post_install ] ;
 AddFilesToPackage boot post-install : $(postInstallFiles) ;
 
 # Gutenprint data files

build/jam/packages/HaikuBootstrap

@@ -133,7 +133,7 @@ AddFilesToPackage boot : $(bootScripts) ;
 local postInstallFiles = default_deskbar_items.sh ;
 postInstallFiles = $(postInstallFiles:G=post-install) ;
 SEARCH on $(postInstallFiles)
-	= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
+	= [ FDirName $(HAIKU_TOP) data system boot post_install ] ;
 AddFilesToPackage boot post-install : $(postInstallFiles) ;
 
 local fortuneFiles = [ Glob $(HAIKU_TOP)/data/system/data/fortunes

build/scripts/build_haiku_image

@@ -6,8 +6,7 @@ set -o errexit
 # outputDir
 # tmpDir
 # addBuildCompatibilityLibDir
-# systemPackages, commonPackages - lists of the hpkg packages copied/updated
+# systemPackages - lists of the hpkg packages copied/updated
-#   (in "system" and "common" respectively)
 # repositories - all repository files
 # downloadDir
 # The following are only for image types:
@@ -281,7 +280,6 @@ done
 if [ -n "$resolvePackageDependencies" ]; then
 	echo "Resolving package dependencies ..."
 
-	# additional packages for system
 	packageUrls=`$getPackageDependencies $repositories -- $systemPackages`
 	for packageUrl in $packageUrls; do
 		packageFileName=`basename $packageUrl`
@@ -290,36 +288,13 @@ if [ -n "$resolvePackageDependencies" ]; then
 		$cp "${sPrefix}$packageFilePath" "${tPrefix}system/packages"
 		systemPackages="$systemPackages $packageFilePath"
 	done
-
-	# Remove packages from the list for common, that are already in the package
-	# list for system.
-	unfilteredCommonPackages="$commonPackages"
-	commonPackages=
-	for packageFile in $unfilteredCommonPackages; do
-		if is_in_list "$packageFile" "$systemPackages"; then
-			:
-		else
-			commonPackages="$commonPackages $packageFile"
-		fi
-	done
-
-	# additional packages for common
-	packageUrls=`$getPackageDependencies $repositories -- $systemPackages \
-		$commonPackages`
-	for packageUrl in $packageUrls; do
-		packageFileName=`basename $packageUrl`
-		packageFilePath="$downloadDir/$packageFileName"
-		downloadFile $packageUrl "$packageFilePath"
-		$cp "${sPrefix}$packageFilePath" "${tPrefix}common/packages"
-		commonPackages="$commonPackages $packageFilePath"
-	done
 fi
 
 
 # install default settings for packages
-for packageFile in $systemPackages $commonPackages; do
+for packageFile in $systemPackages; do
 	if $package list -p $packageFile | egrep '^settings/' > /dev/null; then
-		extractFile $packageFile common/settings settings
+		extractFile $packageFile system/settings settings
 	fi
 done
 

data/bin/install-wifi-firmwares.sh

@@ -286,7 +286,7 @@ function BuildBroadcomFWCutter()
 
 	# Build b43-fwcutter.
 	echo "Compiling b43-fwcutter for installing Broadcom's firmware ..."
-	make PREFIX=/boot/common CFLAGS="-I. -Wall -D_BSD_SOURCE" > /dev/null 2>&1
+	make PREFIX=/boot/system CFLAGS="-I. -Wall -D_BSD_SOURCE" > /dev/null 2>&1
 	result=$?
 	if [ $result -gt 0 ]; then
 		echo "... failed to compile b43-fwcutter."

data/etc/profile.d/bash_completion.sh

@@ -4,9 +4,9 @@
 # Check for recent enough version of bash.
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
 if [ $bmajor -gt 3 ] || [ $bmajor -eq 3 -a $bminor -ge 2 ]; then
-    if shopt -q progcomp && [ -r /boot/common/etc/bash_completion ]; then
+    if shopt -q progcomp && [ -r /boot/system/etc/bash_completion ]; then
         # Source completion code.
-        . /boot/common/etc/bash_completion
+        . /boot/system/etc/bash_completion
     fi
 fi
 unset bash bmajor bminor

data/settings/network/services

@@ -7,6 +7,6 @@
 #}
 
 service ssh {
-	launch	/boot/common/bin/sshd -D
+	launch	/boot/system/bin/sshd -D
 	stand_alone
 }

data/system/boot/Bootscript

@@ -82,7 +82,7 @@ fi
 
 # Create /tmp dir, and make sure it's empty
 
-TMPDIR=/boot/common/cache/tmp
+TMPDIR=/boot/system/cache/tmp
 if [ ! -d $TMPDIR ]; then
 	mkdir -f $TMPDIR
 	chmod a+rwx $TMPDIR
@@ -192,14 +192,14 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi
 
 # Check for fresh install and run post install scripts.
-freshInstallIndicator=/boot/common/settings/fresh_install
+freshInstallIndicator=/boot/system/settings/fresh_install
 postInstallDir=boot/post-install
 if [ -e $freshInstallIndicator ]; then
 	# wait a moment for things to calm down a bit
 	sleep 3
 
 	# execute scripts
-	for f in /boot/system/$postInstallDir/*.sh /boot/common/$postInstallDir/*.sh
+	for f in /boot/system/$postInstallDir/*.sh
 	do
 		if [ -f $f ]; then
 			echo "Running post install script $f ..." > /dev/dprintf

data/system/boot/InstallerFinishScript

@@ -13,7 +13,7 @@ if [ ! -d "$target" ]; then
 	exit 1
 fi
 
-mkdir -p "$target/common/cache/tmp"
+mkdir -p "$target/system/cache/tmp"
 
 # remove Installer link
 rm -f "$target/home/Desktop/Installer"

data/system/boot/SetupEnvironment

@@ -29,11 +29,11 @@ export BE_HOST_CPU
 
 if [ "$SAFEMODE" != "yes" ]
 then
-	export PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/common/apps:/boot/common/preferences:/boot/system/apps:/boot/system/preferences
+	export PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/system/non-packaged/bin:/bin:/boot/system/apps:/boot/system/preferences
-	export LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/common/non-packaged/lib:/boot/common/lib:/boot/system/lib"
+	export LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/system/non-packaged/lib:/boot/system/lib"
-	export ADDON_PATH="%A/add-ons:$HOME/config/non-packaged/add-ons:$HOME/config/add-ons:/boot/common/non-packaged/add-ons:/boot/common/add-ons:/boot/system/add-ons"
+	export ADDON_PATH="%A/add-ons:$HOME/config/non-packaged/add-ons:$HOME/config/add-ons:/boot/system/non-packaged/add-ons:/boot/system/add-ons"
 else
-	export PATH=.:/bin:/boot/common/apps:/boot/system/apps:/boot/system/preferences
+	export PATH=.:/bin:/boot/system/apps:/boot/system/preferences
 	export LIBRARY_PATH="%A/lib:/boot/system/lib"
 	export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
 fi

headers/private/system/directories.h

@@ -13,16 +13,16 @@
 #define kGlobalTempDirectory 			"/tmp"
 #define kGlobalVarDirectory 			"/var"
 
-#define kAppsDirectory 					"/boot/common/apps"
+#define kAppsDirectory 					"/boot/system/apps"
-#define kPreferencesDirectory 			"/boot/common/preferences"
+#define kPreferencesDirectory 			"/boot/system/preferences"
 
 #define kAppLocalAddonsDirectory 		"%A/add-ons"
 #define kAppLocalLibDirectory 			"%A/lib"
 
 #define kVolumeLocalSystemKernelAddonsDirectory	"system/add-ons/kernel"
 #define kVolumeLocalCommonNonpackagedKernelAddonsDirectory	\
-	"common/non-packaged/add-ons/kernel"
+	"system/non-packaged/add-ons/kernel"
-#define kVolumeLocalCommonKernelAddonsDirectory	"common/add-ons/kernel"
+#define kVolumeLocalCommonKernelAddonsDirectory	"system/add-ons/kernel"
 #define kVolumeLocalUserNonpackagedKernelAddonsDirectory	\
 	"home/config/non-packaged/add-ons/kernel"
 #define kVolumeLocalUserKernelAddonsDirectory	"home/config/add-ons/kernel"
@@ -39,20 +39,20 @@
 #define kSystemPreferencesDirectory 	"/boot/system/preferences"
 #define kSystemServersDirectory 		"/boot/system/servers"
 
-#define kCommonDirectory 				"/boot/common"
+#define kCommonDirectory 				"/boot/system"
-#define kCommonAddonsDirectory 			"/boot/common/add-ons"
+#define kCommonAddonsDirectory 			"/boot/system/add-ons"
-#define kCommonBinDirectory 			"/boot/common/bin"
+#define kCommonBinDirectory 			"/boot/system/bin"
-#define kCommonDevelopToolsBinDirectory "/boot/common/develop/tools/current/bin"
+#define kCommonDevelopToolsBinDirectory "/boot/system/develop/tools/current/bin"
-#define kCommonEtcDirectory 			"/boot/common/settings/etc"
+#define kCommonEtcDirectory 			"/boot/system/settings/etc"
-#define kCommonLibDirectory 			"/boot/common/lib"
+#define kCommonLibDirectory 			"/boot/system/lib"
-#define kCommonPackagesDirectory 		"/boot/common/packages"
+#define kCommonPackagesDirectory 		"/boot/system/packages"
-#define kCommonSettingsDirectory 		"/boot/common/settings"
+#define kCommonSettingsDirectory 		"/boot/system/settings"
-#define kCommonTempDirectory 			"/boot/common/cache/tmp"
+#define kCommonTempDirectory 			"/boot/system/cache/tmp"
-#define kCommonVarDirectory 			"/boot/common/var"
+#define kCommonVarDirectory 			"/boot/system/var"
-#define kCommonLogDirectory 			"/boot/common/var/log"
+#define kCommonLogDirectory 			"/boot/system/var/log"
-#define kCommonNonpackagedAddonsDirectory	"/boot/common/non-packaged/add-ons"
+#define kCommonNonpackagedAddonsDirectory	"/boot/system/non-packaged/add-ons"
-#define kCommonNonpackagedBinDirectory 	"/boot/common/non-packaged/bin"
+#define kCommonNonpackagedBinDirectory 	"/boot/system/non-packaged/bin"
-#define kCommonNonpackagedLibDirectory 	"/boot/common/non-packaged/lib"
+#define kCommonNonpackagedLibDirectory 	"/boot/system/non-packaged/lib"
 
 #define kUserDirectory 					"/boot/home"
 #define kUserConfigDirectory 			"/boot/home/config"

src/add-ons/accelerants/radeon_hd/bios.cpp

@@ -195,7 +195,7 @@ radeon_dump_bios()
 
 	FILE* fp;
 	char filename[255];
-	sprintf(filename, "/boot/common/cache/tmp/radeon_hd_bios_1002_%" B_PRIx32
+	sprintf(filename, "/boot/system/cache/tmp/radeon_hd_bios_1002_%" B_PRIx32
 		"_%" B_PRIu32 ".bin", info.pciID, info.deviceIndex);
 
 	fp = fopen(filename, "wb");

src/add-ons/index_server/fulltext/FullTextAnalyser.cpp

@@ -130,7 +130,7 @@ FullTextAnalyser::_IsInIndexDirectory(const entry_ref& ref)
 	if (BString(path.Path()).FindFirst(fDataBasePath.Path()) == 0)
 		return true;
 
-	if (BString(path.Path()).FindFirst("/boot/common/cache/tmp") == 0)
+	if (BString(path.Path()).FindFirst("/boot/system/cache/tmp") == 0)
 		return true;
 
 	return false;

src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp

@@ -25,7 +25,7 @@ static const char* const kLinkPaths[PackageLinkSymlink::TYPE_ENUM_COUNT]
 		"../../../home/config"
 	},
 	{
-		"../../../common/settings",
+		"../../../system/settings",
 		"../../../common/settings",
 		"../../../home/config/settings/global"
 	}

src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp

@@ -53,14 +53,9 @@ static const uint32 kAllStatFields = B_STAT_MODE | B_STAT_UID | B_STAT_GID
 	| B_STAT_CREATION_TIME | B_STAT_CHANGE_TIME;
 
 // shine-through directories
-const char* const kSystemShineThroughDirectories[] = {
+const char* const kShineThroughDirectories[] = {
-	"packages", NULL
-};
-const char* const kCommonShineThroughDirectories[] = {
 	"cache", "non-packaged", "packages", "settings", "var", NULL
 };
-const char* const* kHomeShineThroughDirectories
-	= kCommonShineThroughDirectories;
 
 // sanity limit for activation change request
 const size_t kMaxActivationRequestSize = 10 * 1024 * 1024;
@@ -1668,13 +1663,9 @@ Volume::_CreateShineThroughDirectories(const char* shineThroughSetting)
 		// nothing specified -- derive from mount type
 		switch (fMountType) {
 			case PACKAGE_FS_MOUNT_TYPE_SYSTEM:
-				directories = kSystemShineThroughDirectories;
-				break;
 			case PACKAGE_FS_MOUNT_TYPE_COMMON:
-				directories = kCommonShineThroughDirectories;
-				break;
 			case PACKAGE_FS_MOUNT_TYPE_HOME:
-				directories = kHomeShineThroughDirectories;
+				directories = kShineThroughDirectories;
 				break;
 			case PACKAGE_FS_MOUNT_TYPE_CUSTOM:
 				return B_OK;
@@ -1682,11 +1673,11 @@ Volume::_CreateShineThroughDirectories(const char* shineThroughSetting)
 				return B_BAD_VALUE;
 		}
 	} else if (strcmp(shineThroughSetting, "system") == 0)
-		directories = kSystemShineThroughDirectories;
+		directories = kShineThroughDirectories;
 	else if (strcmp(shineThroughSetting, "common") == 0)
-		directories = kCommonShineThroughDirectories;
+		directories = kShineThroughDirectories;
 	else if (strcmp(shineThroughSetting, "home") == 0)
-		directories = kHomeShineThroughDirectories;
+		directories = kShineThroughDirectories;
 	else if (strcmp(shineThroughSetting, "none") == 0)
 		directories = NULL;
 	else

src/add-ons/media/plugins/ffmpeg/config.h

@@ -1,13 +1,13 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--prefix=/boot/common --enable-shared --disable-debug --disable-mmx --disable-demuxer=audio-beos --disable-muxer=audio-beos"
+#define FFMPEG_CONFIGURATION "--prefix=/boot/system --enable-shared --disable-debug --disable-mmx --disable-demuxer=audio-beos --disable-muxer=audio-beos"
 #if CONFIG_GPL
 #	define FFMPEG_LICENSE "GPL version 2 or later"
 #else
 #	define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #endif
-#define FFMPEG_DATADIR "/boot/common/share/ffmpeg"
+#define FFMPEG_DATADIR "/boot/system/data/ffmpeg"
 #define CC_TYPE "gcc"
 #define CC_VERSION __VERSION__
 #define restrict __restrict__

src/add-ons/print/drivers/pdf/doc/Create_Report_Mail.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-/boot/common/apps/BeMail mailto:[email protected] -subject "pdf_writer v.1.0b1 report" -body "Thanks for taking the time to report how pdf_writer v1.0b1 worked for you!
+/boot/system/apps/BeMail mailto:[email protected] -subject "pdf_writer v.1.0b1 report" -body "Thanks for taking the time to report how pdf_writer v1.0b1 worked for you!
 
 Please edit the following text to reflect your experience when trying pdf_writer:
 

src/apps/autoraise/AutoRaise.txt

@@ -8,7 +8,7 @@ This tiny Deskbar replicant is a window autoraiser. It will bring to front whate
 
 
 Installation:
-- put the AutoRaise folder where you want (I suggest /boot/common/apps),
+- put the AutoRaise folder where you want (I suggest /boot/system/apps),
 - you can delete the src/ folder if you aren't interested in the sources,
 - double-click on either the 'Put me in Deskbar', or 'Put me in Deskbar (persistant)', the later will keep it in between boots.
 

src/apps/installer/WorkerThread.cpp

@@ -96,11 +96,10 @@ public:
 			fIgnorePaths.insert("rr_moved");
 			fIgnorePaths.insert("boot.catalog");
 			fIgnorePaths.insert("haiku-boot-floppy.image");
-			fIgnorePaths.insert("common/var/swap");
+			fIgnorePaths.insert("system/var/swap");
-			fIgnorePaths.insert("common/var/shared_memory");
+			fIgnorePaths.insert("system/var/shared_memory");
 
 			fPackageFSRootPaths.insert("system");
-			fPackageFSRootPaths.insert("common");
 			fPackageFSRootPaths.insert("home/config");
 		} catch (std::bad_alloc&) {
 		}
@@ -464,7 +463,7 @@ WorkerThread::_PerformInstall(partition_id sourcePartitionID,
 		alert->SetShortcut(1, B_ESCAPE);
 		if (alert->Go() != 0) {
 		// TODO: Would be cool to offer the option here to clean additional
-		// folders at the user's choice (like /boot/common and /boot/develop).
+		// folders at the user's choice.
 			return _InstallationError(B_CANCELED);
 		}
 	}

src/bin/bash/Jamfile

@@ -8,7 +8,7 @@ local cpuName = [ Match "([^-]*)-.*" : $(gccMachine) ] ;
 local vendorName = [ Match "[^-]*-([^-]*)" : $(gccMachine) ] ;
 local osName = [ Match "[^-]*-[^-]*-([^-]*)" : $(gccMachine) ] ;
 
-SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"bash\"' -DSHELL -DLOCALEDIR='\"/boot/common/share/locale\"' -DPACKAGE='\"bash\"' ;
+SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"bash\"' -DSHELL -DLOCALEDIR='\"/boot/system/data/locale\"' -DPACKAGE='\"bash\"' ;
 SubDirCcFlags -DCONF_MACHTYPE='\"$(gccMachine)\"' ;
 SubDirCcFlags -DCONF_HOSTTYPE='\"$(cpuName)\"' ;
 SubDirCcFlags -DCONF_VENDOR='\"$(vendorName)\"' ;

src/bin/bash/config-top.h

@@ -55,8 +55,8 @@
 #ifndef DEFAULT_PATH_VALUE
 #define DEFAULT_PATH_VALUE \
   ".:/boot/home/config/non-packaged/bin:/boot/home/config/bin" \
-  ":/boot/common/non-packaged/bin:/boot/common/bin" \
+  ":/boot/system/non-packaged/bin" \
-  ":/bin:/boot/common/apps:/boot/common/preferences" \
+  ":/bin:/boot/system/non-packaged/apps:/boot/system/non-packaged/preferences" \
   ":/boot/system/apps" \
   ":/boot/system/preferences"
 #endif
@@ -65,8 +65,8 @@
    the Posix.2 confstr () function, or CS_PATH define are not present. */
 #ifndef STANDARD_UTILS_PATH
 #define STANDARD_UTILS_PATH \
-  ":/boot/common/non-packaged/bin:/boot/common/bin" \
+  ":/boot/system/non-packaged/bin" \
-  ":/bin:/boot/common/apps:/boot/common/preferences" \
+  ":/bin:/boot/system/non-packaged/apps:/boot/system/non-packaged/preferences" \
   ":/boot/system/apps" \
   ":/boot/system/preferences" 
 #endif

src/bin/bash/pathnames.h

@@ -29,6 +29,6 @@
 
 /* The default location of the bash debugger initialization/startup file. */
 #define DEBUGGER_START_FILE	\
-	"/boot/common/share/bashdb/bashdb-main.inc"
+	"/boot/system/data/bashdb/bashdb-main.inc"
 
 #endif /* _PATHNAMES_H */

src/bin/coreutils/INSTALL

@@ -242,10 +242,10 @@ directory contains several dysfunctional programs; working variants of
 these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
 in your `PATH', put it _after_ `/usr/bin'.
 
-   On Haiku, software installed for all users goes in `/boot/common',
+   On Haiku, software installed for all users goes in `/boot/system',
 not `/usr/local'.  It is recommended to use the following options:
 
-     ./configure --prefix=/boot/common
+     ./configure --prefix=/boot/system
 
 Specifying the System Type
 ==========================

src/bin/coreutils/lib/configmake.h

@@ -1,26 +1,26 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-#define PREFIX "/boot/common"
+#define PREFIX "/boot/system"
-#define EXEC_PREFIX "/boot/common"
+#define EXEC_PREFIX "/boot/system"
-#define BINDIR "/boot/common/bin"
+#define BINDIR "/boot/system/bin"
-#define SBINDIR "/boot/common/sbin"
+#define SBINDIR "/boot/system/bin"
-#define LIBEXECDIR "/boot/common/libexec"
+#define LIBEXECDIR "/boot/system/lib"
-#define DATAROOTDIR "/boot/common/share"
+#define DATAROOTDIR "/boot/system/data"
-#define DATADIR "/boot/common/share"
+#define DATADIR "/boot/system/data"
-#define SYSCONFDIR "/boot/common/etc"
+#define SYSCONFDIR "/boot/system/settings/etc"
-#define SHAREDSTATEDIR "/boot/common/com"
+#define SHAREDSTATEDIR "/boot/system/var"
-#define LOCALSTATEDIR "/boot/common/var"
+#define LOCALSTATEDIR "/boot/system/var"
-#define INCLUDEDIR "/boot/common/include"
+#define INCLUDEDIR "/boot/system/develop/headers"
-#define OLDINCLUDEDIR "/usr/include"
+#define OLDINCLUDEDIR "/boot/system/develop/headers"
-#define DOCDIR "/boot/common/share/doc/coreutils"
+#define DOCDIR "/boot/system/documentation/coreutils"
-#define INFODIR "/boot/common/share/info"
+#define INFODIR "/boot/system/documentation/info"
-#define HTMLDIR "/boot/common/share/doc/coreutils"
+#define HTMLDIR "/boot/system/documentation/coreutils"
-#define DVIDIR "/boot/common/share/doc/coreutils"
+#define DVIDIR "/boot/system/documentation/coreutils"
-#define PDFDIR "/boot/common/share/doc/coreutils"
+#define PDFDIR "/boot/system/documentation/coreutils"
-#define PSDIR "/boot/common/share/doc/coreutils"
+#define PSDIR "/boot/system/documentation/coreutils"
-#define LIBDIR "/boot/common/lib"
+#define LIBDIR "/boot/system/lib"
-#define LOCALEDIR "/boot/common/share/locale"
+#define LOCALEDIR "/boot/system/data/locale"
-#define MANDIR "/boot/common/share/man"
+#define MANDIR "/boot/system/documentation/man"
-#define PKGDATADIR "/boot/common/share/coreutils"
+#define PKGDATADIR "/boot/system/data/coreutils"
-#define PKGINCLUDEDIR "/boot/common/include/coreutils"
+#define PKGINCLUDEDIR "/boot/system/develop/headers/coreutils"
-#define PKGLIBDIR "/boot/common/lib/coreutils"
+#define PKGLIBDIR "/boot/system/lib/coreutils"
-#define PKGLIBEXECDIR "/boot/common/libexec/coreutils"
+#define PKGLIBEXECDIR "/boot/system/lib/coreutils"

src/bin/findutils/locate/Jamfile

@@ -40,8 +40,8 @@ actions MkUpdateDb1
 {
 	sed \
 	-e "s,@bindir@,/bin," \
-	-e "s,/usr/bin,/boot/common/bin," \
+	-e "s,/usr/bin,/boot/system/bin," \
-	-e "s,@libexecdir@,/bin," \
+	-e "s,@libexecdir@,/lib," \
 	-e "s,@LOCATE_DB@,/var/locatedb," \
 	-e "s,@VERSION@,4.2.33," \
 	-e "s,@find@,find," \

src/bin/network/wget/src/version.c

@@ -3,5 +3,5 @@
 
 const char *version_string = "1.12"
 ;
-const char *compilation_string = "i586-pc-haiku-gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/boot/common/etc/wgetrc\" -DLOCALEDIR=\"/boot/common/share/locale\" -I. -I../lib -I ../md5 -I/boot/common/include -O2 -Wall";
+const char *compilation_string = "i586-pc-haiku-gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/boot/system/settings/etc/wgetrc\" -DLOCALEDIR=\"/boot/system/data/locale\" -I. -I../lib -I ../md5 -I/boot/system/develop/headers -O2 -Wall";
-const char *link_string = "i586-pc-haiku-gcc -O2 -Wall /boot/common/lib/libiconv.so -Wl,-rpath -Wl,/boot/common/lib ftp-opie.o gen-md5.o ../lib/libgnu.a ../md5/libmd5.a";
+const char *link_string = "i586-pc-haiku-gcc -O2 -Wall /boot/system/lib/libiconv.so -Wl,-rpath -Wl,/boot/system/lib ftp-opie.o gen-md5.o ../lib/libgnu.a ../md5/libmd5.a";

src/build/libroot/find_directory.cpp

@@ -68,10 +68,10 @@ find_directory(directory_which which, dev_t device, bool createIt,
 			path = HAIKU_BUILD_GENERATED_DIRECTORY "/tmp";
 			break;
 		case B_COMMON_SETTINGS_DIRECTORY:
-			path = HAIKU_BUILD_GENERATED_DIRECTORY "/common/settings";
+			path = HAIKU_BUILD_GENERATED_DIRECTORY "/system/settings";
 			break;
 		case B_COMMON_CACHE_DIRECTORY:
-			path = HAIKU_BUILD_GENERATED_DIRECTORY "/common/cache";
+			path = HAIKU_BUILD_GENERATED_DIRECTORY "/system/cache";
 			break;
 		case B_USER_SETTINGS_DIRECTORY:
 			path = HAIKU_BUILD_GENERATED_DIRECTORY "/user/settings";

src/data/deskbar/menu_entries

@@ -1,7 +1,6 @@
 directory /boot/home/config/settings/deskbar/menu
 directory /boot/home/config/non-packaged/data/deskbar/menu
 directory /boot/home/config/data/deskbar/menu
-directory /boot/common/non-packaged/data/deskbar/menu
+directory /boot/system/non-packaged/data/deskbar/menu
-directory /boot/common/data/deskbar/menu
 directory /boot/system/data/deskbar/menu
 

src/kits/media/DormantNodeManager.cpp

@@ -34,7 +34,7 @@
 	It handles loading/unloading of dormant nodes.
 
 	Dormant media nodes can be instantiated on demand. The reside on harddisk in
-	the directories /boot/beos/system/add-ons/media, /boot/common/add-ons/media,
+	the directories /boot/beos/system/add-ons/media
 	and /boot/home/config/add-ons/media.
 	Multiple media nodes can be included in one file, they can be accessed using
 	the BMediaAddOn that each file implements.

src/libs/expat/xmlwf/xmlwf

@@ -18,7 +18,7 @@ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
 # if CDPATH is set.
 if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
 
-relink_command="cd /boot/home/projects/develop/ThirdParty/Haiku/src/libs/expat; LIBRARY_PATH=\"%A/lib:/boot/home/config/lib:/boot/beos/system/lib:/boot/common/apps/GeekGadgets/lib:/boot/common/apps/X11R6.4/lib\"; export LIBRARY_PATH; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LIBRARY_PATH=\"%A/lib:/boot/home/config/lib:/boot/beos/system/lib:/boot/common/apps/GeekGadgets/lib:/boot/common/apps/X11R6.4/lib\"; export LIBRARY_PATH; PATH=\".:/boot/home/config/bin:/bin:/boot/common/apps:/boot/common/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin:/boot/common/apps/GeekGadgets/bin:/boot/common/apps/X11R6.4/bin\"; export PATH; gcc -g -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H -I/boot/home/config/include -I./lib -I. -o \$progdir/\$file xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/readfilemap.o  -L/boot/home/config/lib ./.libs/libexpat.so -Wl,--rpath -Wl,/boot/home/projects/develop/ThirdParty/Haiku/src/libs/expat/.libs -Wl,--rpath -Wl,/boot/home//lib"
+relink_command="cd /boot/home/projects/develop/ThirdParty/Haiku/src/libs/expat; LIBRARY_PATH=\"%A/lib:/boot/home/config/lib:/boot/beos/system/lib:/boot/system/apps/GeekGadgets/lib:/boot/system/apps/X11R6.4/lib\"; export LIBRARY_PATH; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LIBRARY_PATH=\"%A/lib:/boot/home/config/lib:/boot/beos/system/lib:/boot/system/apps/GeekGadgets/lib:/boot/system/apps/X11R6.4/lib\"; export LIBRARY_PATH; PATH=\".:/boot/home/config/bin:/bin:/boot/system/apps:/boot/system/preferences:/boot/develop/tools/gnupro/bin:/boot/common/apps/GeekGadgets/bin:/boot/common/apps/X11R6.4/bin\"; export PATH; gcc -g -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H -I/boot/home/config/include -I./lib -I. -o \$progdir/\$file xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/readfilemap.o  -L/boot/home/config/lib ./.libs/libexpat.so -Wl,--rpath -Wl,/boot/home/projects/develop/ThirdParty/Haiku/src/libs/expat/.libs -Wl,--rpath -Wl,/boot/home//lib"
 
 # This environment variable determines our operation mode.
 if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then

src/libs/iconv/config.h

@@ -260,7 +260,7 @@
 /* #undef ICONV_CONST */
 
 /* Define to the value of ${prefix}, as a string. */
-#define INSTALLPREFIX "/boot/common"
+#define INSTALLPREFIX "/boot/system"
 
 /* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
 #define MALLOC_0_IS_NONNULL 1

src/libs/ncurses/include/ncurses_cfg.h

@@ -51,8 +51,8 @@
 #define HAVE_LONG_FILE_NAMES 1
 #define MIXEDCASE_FILENAMES 1
 #define USE_DATABASE 1
-#define TERMINFO_DIRS "/boot/common/data/terminfo"
+#define TERMINFO_DIRS "/boot/system/data/terminfo"
-#define TERMINFO "/boot/common/data/terminfo"
+#define TERMINFO "/boot/system/data/terminfo"
 #define TERMPATH "/etc/termcap"
 #define HAVE_BIG_CORE 1
 #define PURE_TERMINFO 1

src/libs/print/libgutenprint/INSTALL

@@ -242,10 +242,10 @@ directory contains several dysfunctional programs; working variants of
 these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
 in your `PATH', put it _after_ `/usr/bin'.
 
-   On Haiku, software installed for all users goes in `/boot/common',
+   On Haiku, software installed for all users goes in `/boot/system',
 not `/usr/local'.  It is recommended to use the following options:
 
-     ./configure --prefix=/boot/common
+     ./configure --prefix=/boot/system
 
 Specifying the System Type
 ==========================

src/preferences/printers/doxygen.cfg

@@ -580,7 +580,7 @@ ALLEXTERNALS           = NO
 # The PERL_PATH should be the absolute path and name of the perl script 
 # interpreter (i.e. the result of `which perl'). 
 
-PERL_PATH              = /boot/common/bin/perl
+PERL_PATH              = /boot/system/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool   

src/servers/package/Root.cpp

@@ -257,19 +257,6 @@ Root::VolumeNodeMonitorEventOccurred(Volume* volume)
 }
 
 
-status_t
-Root::GetRootDirectoryRef(PackageFSMountType mountType, node_ref& _ref)
-{
-	AutoLocker<BLocker> locker(fLock);
-	Volume** volume = _GetVolume(mountType);
-	if (volume == NULL)
-		return B_ENTRY_NOT_FOUND;
-
-	_ref = (*volume)->RootDirectoryRef();
-	return B_OK;
-}
-
-
 void
 Root::LastReferenceReleased()
 {

src/servers/package/Root.h

@@ -50,9 +50,6 @@ public:
 private:
 	// Volume::Listener
 	virtual	void				VolumeNodeMonitorEventOccurred(Volume* volume);
-	virtual	status_t			GetRootDirectoryRef(
-									PackageFSMountType mountType,
-									node_ref& _ref) ;
 
 protected:
 	virtual	void				LastReferenceReleased();

src/servers/package/Volume.cpp

@@ -605,10 +605,9 @@ private:
 			return;
 
 		// Open the root directory of the installation location where we will
-		// extract the files -- that's the volume's root directory save for
+		// extract the files -- that's the volume's root directory.
-		// "system" where it is "common".
 		BDirectory rootDirectory;
-		status_t error = fVolume->_OpenSettingsRootDirectory(rootDirectory);
+		status_t error = rootDirectory.SetTo(&fVolume->fRootDirectoryRef);
 		if (error != B_OK) {
 			throw Exception(error,
 				BString().SetToFormat("failed to get the root directory "
@@ -2240,41 +2239,6 @@ Volume::_OpenPackagesSubDirectory(const RelativePath& path, bool create,
 }
 
 
-status_t
-Volume::_OpenSettingsRootDirectory(BDirectory& _directory)
-{
-	switch (fMountType) {
-		case PACKAGE_FS_MOUNT_TYPE_SYSTEM:
-		{
-			// try our sibling volume
-			if (fListener != NULL) {
-				node_ref ref;
-				status_t error = fListener->GetRootDirectoryRef(
-					PACKAGE_FS_MOUNT_TYPE_COMMON, ref);
-				if (error != B_ENTRY_NOT_FOUND)
-					return error;
-				return _directory.SetTo(&ref);
-			}
-
-			// try a path relative to our root directory
-			BDirectory rootDirectory;
-			status_t error = rootDirectory.SetTo(&fRootDirectoryRef);
-			if (error != B_OK)
-				return error;
-			return _directory.SetTo(&rootDirectory, "../common");
-		}
-
-		case PACKAGE_FS_MOUNT_TYPE_COMMON:
-		case PACKAGE_FS_MOUNT_TYPE_HOME:
-			return _directory.SetTo(&fRootDirectoryRef);
-
-		case PACKAGE_FS_MOUNT_TYPE_CUSTOM:
-		default:
-			return B_BAD_VALUE;
-	}
-}
-
-
 status_t
 Volume::_CreateActivationFileContent(const PackageSet& toActivate,
 	const PackageSet& toDeactivate, BString& _content)

src/servers/package/Volume.h

@@ -214,9 +214,6 @@ public:
 
 	virtual	void				VolumeNodeMonitorEventOccurred(Volume* volume)
 									= 0;
-	virtual	status_t			GetRootDirectoryRef(
-									PackageFSMountType mountType,
-									node_ref& _ref) = 0;
 };
 
 

src/system/libroot/os/find_directory.cpp

@@ -39,7 +39,7 @@
  */
 
 #define SYSTEM "system"
-#define COMMON "common"
+#define COMMON SYSTEM
 #define NON_PACKAGED "/non-packaged"
 
 

src/tests/add-ons/kernel/file_systems/fs_shell/fsh.cpp

@@ -1309,7 +1309,7 @@ copydir(char *fromPath,char *toPath)
 static int
 do_copytest(int argc, char **argv)
 {
-    char *fromPath = "/boot/common/apps/internet/mozilla";
+    char *fromPath = "/boot/system/apps/internet/mozilla";
 
 	if (argc > 2) {
 		printf("usage: copytest <path>");

src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp

@@ -19,7 +19,7 @@
 
 
 const char *appName = "application/x-vnd.jsr-additemtest";
-const char *pulsePath = "/boot/common/apps/Pulse";
+const char *pulsePath = "/boot/system/apps/Pulse";
 
 
 /*

src/tests/kits/net/preflet/NetworkSetupWindow.cpp

@@ -176,7 +176,7 @@ NetworkSetupWindow::_BuildProfilesMenu(BMenu* menu, int32 msg_what)
 
 	menu->SetRadioMode(true);
 
-	BDirectory dir("/boot/common/settings/network/profiles");
+	BDirectory dir("/boot/system/settings/network/profiles");
 
 	if (dir.InitCheck() == B_OK) {
 		BEntry entry;

src/tests/kits/net/preflet/ServicesAddOn/ServicesAddOn.cpp

@@ -104,7 +104,7 @@ ServicesAddOn::ParseInetd()
 status_t
 ServicesAddOn::ParseXinetd()
 {
-	FILE *f = fopen("/boot/common/settings/network/services", "r");
+	FILE *f = fopen("/boot/system/settings/network/services", "r");
 	if (f) {
 		char line[1024], *linePtr;
 		char *token;

src/tests/kits/storage/FindDirectoryTest.cpp

@@ -322,10 +322,10 @@ test_find_directory(directory_which dir, BPath &path, dev_t device)
 			break;
 		// Global directories.
 		case B_APPS_DIRECTORY:
-			error = path.SetTo("/boot/common/apps");
+			error = path.SetTo("/boot/system/apps");
 			break;
 		case B_PREFERENCES_DIRECTORY:
-			error = path.SetTo("/boot/common/preferences");
+			error = path.SetTo("/boot/system/preferences");
 			break;
 		case B_UTILITIES_DIRECTORY:
 			error = path.SetTo("/boot/utilities");