[haiku-commits] haiku: hrev46167 - in src: . kits tests/add-ons/kernel/file_systems/beserved/server bin tests/add-ons/kernel/file_systems/beserved
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 3 Oct 2013 22:20:00 +0200 (CEST)
hrev46167 adds 7 changesets to branch 'master'
old head: bf9b153fcc3129e7ea743a433c59bb76ce9ba09c
new head: 45b3329d9f364636fde8deb7000b81e60b60797e
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=45b3329+%5Ebf9b153
----------------------------------------------------------------------------
f73f5d4: 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.
ded25be: runtime loader: 64-bit ktrace output fixes
4b7e219: Remove /boot/common for good
* Remove support for the "common" installation location from packagefs,
package kit, package daemon, package managers.
* Rename the B_COMMON_*_DIRECTORY constants referring to writable
directories to B_SYSTEM_*_DIRECTORY.
* Remove/adjust the use of various B_COMMON_*_DIRECTORY constants.
I'm sure some occurrence still remain. They can be adjusted when the
remaining B_COMMON_*_DIRECTORY constants are removed.
f6616e0: Update packages that hard-coded references to /boot/common
There are a few more (like gcc still including there respective search
paths), but those should be harmless and can be adjusted later.
730939f: Declare libicu* requirements in the haiku* packages
6bbd7bf: Make secondary haiku_devel package depend on the primary
Only the primary haiku_devel package contains the system headers.
45b3329: Fix incorrect uses of getpwuid_r()
The function's behavior was recently fixed to succeed, but return a NULL
pointer, when the entry was not found. Fixes a crash in this case.
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
140 files changed, 457 insertions(+), 644 deletions(-)
Jamfile | 4 --
build/jam/DefaultBuildProfiles | 61 ++++++--------------
build/jam/ImageRules | 40 ++++---------
build/jam/OptionalPackages | 14 ++---
build/jam/images/HaikuImage | 30 +++++-----
build/jam/images/HaikuImageBootstrap | 20 +++----
build/jam/images/HaikuImageCommon | 2 +-
build/jam/packages/Haiku | 2 +-
build/jam/packages/HaikuBootstrap | 2 +-
build/jam/repositories/HaikuPorts/x86 | 28 ++++-----
build/jam/repositories/HaikuPorts/x86_64 | 20 +++----
build/jam/repositories/HaikuPorts/x86_gcc2 | 28 ++++-----
build/scripts/build_haiku_image | 31 +---------
data/bin/install-wifi-firmwares.sh | 2 +-
data/etc/profile.d/bash_completion.sh | 4 +-
data/settings/network/services | 2 +-
data/system/boot/Bootscript | 6 +-
data/system/boot/InstallerFinishScript | 2 +-
data/system/boot/SetupEnvironment | 8 +--
.../post_install/add_catalog_entry_attributes.sh | 0
.../boot/post_install/default_deskbar_items.sh | 0
data/{common => system}/settings/fresh_install | 0
headers/os/package/PackageDefs.h | 3 +-
headers/os/storage/FindDirectory.h | 39 +++++++------
headers/private/package/manager/PackageManager.h | 3 -
headers/private/package/packagefs.h | 1 -
headers/private/system/directories.h | 36 ++++++------
src/add-ons/accelerants/radeon_hd/bios.cpp | 2 +-
.../index_server/fulltext/FullTextAnalyser.cpp | 2 +-
.../file_systems/nfs4/idmapper/IdMapper.cpp | 2 +-
.../package_links/PackageLinkSymlink.cpp | 4 +-
.../packagefs/volume/PackageFSRoot.cpp | 1 -
.../file_systems/packagefs/volume/Volume.cpp | 25 ++------
.../locale/catalogs/plaintext/Catalog.cpp | 2 +-
src/add-ons/media/plugins/ffmpeg/config.h | 4 +-
.../print/drivers/pdf/doc/Create_Report_Mail.sh | 2 +-
.../print/drivers/pdf/source/PrinterPrefs.cpp | 2 +-
src/apps/autoraise/AutoRaise.txt | 2 +-
src/apps/expander/ExpanderRules.cpp | 3 +-
src/apps/haiku-depot/MainWindow.cpp | 3 -
src/apps/haiku-depot/PackageManager.cpp | 6 +-
src/apps/installer/WorkerThread.cpp | 7 +--
src/apps/login/DesktopWindow.cpp | 2 +-
src/apps/mail/Content.cpp | 2 +-
src/apps/soundrecorder/RecorderWindow.cpp | 2 +-
src/apps/terminal/Shell.cpp | 5 +-
src/apps/webpositive/BrowserWindow.cpp | 2 +-
src/apps/workspaces/Workspaces.cpp | 4 +-
src/bin/bash/Jamfile | 2 +-
src/bin/bash/bashline.c | 2 +-
src/bin/bash/config-top.h | 8 +--
src/bin/bash/pathnames.h | 2 +-
src/bin/coreutils/INSTALL | 4 +-
src/bin/coreutils/lib/configmake.h | 50 ++++++++--------
src/bin/finddir.c | 38 ++++++------
src/bin/findutils/locate/Jamfile | 4 +-
src/bin/network/wget/src/version.c | 4 +-
src/bin/pkgman/command_install.cpp | 14 +----
src/bin/pkgman/command_search.cpp | 3 -
src/bin/pkgman/command_uninstall.cpp | 14 +----
src/bin/pkgman/command_update.cpp | 14 +----
src/build/libroot/find_directory.cpp | 10 ++--
src/data/deskbar/menu_entries | 3 +-
src/data/package_infos/arm/haiku | 8 +++
.../package_infos/generic/haiku_devel_secondary | 1 +
src/data/package_infos/ppc/haiku | 8 +++
src/data/package_infos/x86/haiku | 8 +++
src/data/package_infos/x86/haiku_secondary | 8 +++
src/data/package_infos/x86_64/haiku | 8 +++
src/data/package_infos/x86_64/haiku_secondary | 8 +++
src/data/package_infos/x86_gcc2/haiku | 8 +++
src/data/package_infos/x86_gcc2/haiku_secondary | 8 +++
src/kits/media/DormantNodeManager.cpp | 2 +-
src/kits/network/libbind/irs/gen.c | 2 +-
src/kits/network/libbind/irs/lcl_ho.c | 2 +-
src/kits/network/libbind/resolv/res_init.c | 2 +-
src/kits/opengl/GLRendererRoster.cpp | 3 +-
src/kits/package/Context.cpp | 2 +-
src/kits/package/PackageRoster.cpp | 4 +-
src/kits/package/manager/PackageManager.cpp | 26 ++-------
src/kits/package/solver/SolverRepository.cpp | 6 --
src/kits/print/PrintTransport.cpp | 3 +-
src/kits/print/Printer.cpp | 3 +-
src/kits/print/PrinterDriverAddOn.cpp | 7 +--
src/kits/screensaver/ScreenSaverRunner.cpp | 3 +-
.../storage/disk_device/DiskDeviceRoster.cpp | 3 +-
.../disk_device/DiskSystemAddOnManager.cpp | 5 +-
src/kits/storage/mime/database_support.cpp | 3 +-
src/kits/tracker/DeskWindow.cpp | 11 +---
src/kits/tracker/FSUtils.cpp | 6 +-
src/kits/translation/TranslatorRoster.cpp | 3 +-
src/libs/expat/xmlwf/xmlwf | 2 +-
src/libs/iconv/config.h | 2 +-
src/libs/ncurses/include/ncurses_cfg.h | 4 +-
src/libs/print/libgutenprint/INSTALL | 4 +-
src/libs/print/libprint/Transport.cpp | 3 +-
src/preferences/joysticks/JoyWin.cpp | 2 +-
src/preferences/mail/DNSQuery.cpp | 2 +-
src/preferences/network/EthernetSettingsView.cpp | 4 +-
[ *** stats truncated: 41 lines dropped *** ]
############################################################################
Commit: f73f5d4c42a01ece688cbb57b5d332cc0f68b2c6
URL: http://cgit.haiku-os.org/haiku/commit/?id=f73f5d4
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Sun Sep 29 20:09:00 2013 UTC
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.
----------------------------------------------------------------------------
diff --git a/Jamfile b/Jamfile
index c9562f5..dd81468 100644
--- a/Jamfile
+++ b/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
;
}
}
diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 6f2db7a..4615f55 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -36,12 +36,6 @@ rule DefineDefaultBuildProfiles
HAIKU_IMAGE_SIZE = 800 ;
AddHaikuImagePackages
- wpa_supplicant
- :
- system
- ;
-
- AddHaikuImagePackages
bepdf
cvs
keymapswitcher
@@ -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 ;
}
}
@@ -93,19 +88,14 @@ rule DefineDefaultBuildProfiles
HAIKU_IMAGE_SIZE = 600 ;
AddHaikuImagePackages
- openssl
- wpa_supplicant
- :
- system
- ;
-
- AddHaikuImagePackages
man
nano
openssh
+ openssl
p7zip
pe
vision
+ wpa_supplicant
xz_utils
;
@@ -118,40 +108,30 @@ rule DefineDefaultBuildProfiles
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
-# mkdepend
-# perl
+ ncurses
+ ncurses_devel
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
;
}
}
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 28c5f7f..7ca97bf 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -840,28 +840,14 @@ rule AddPackagesAndRepositoryVariablesToContainerScript
script : container
AddVariableToScript $(script) : resolvePackageDependencies
: $(resolvePackageDependencies) ;
- # Add variables "systemPackages" and "commonPackages" with the packages
- # copied/updated.
+ # Add variable "systemPackages" with the packages 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 ;
- 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 ;
+ AddTargetVariableToScript $(script) : $(allPackages) : systemPackages ;
# 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> ] ;
- # Adds the given package <packages>s to the image.
<installationLocation>
- # is either "system" or "common" (the default) and specifies where the
- # packages shall be installed.
-
- installationLocation ?= common ;
+ # AddHaikuImagePackages <packages> ;
+ # Adds the given packages <packages> to the image.
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
- # the installation location of the package (will be copied to the
- # packages/ subdirectory).
+ # * For a hpkg <dirTokens> is ignored. The package will be copied into
the
+ # system/packages directory.
# * 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) ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 563480a..e071611 100644
--- a/build/jam/OptionalPackages
+++ b/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/common/cache/tmp ;
+ AddSymlinkToHaikuImage var : /boot/system/var/log ;
+ 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
- jpeg_devel libpng_devel zlib_devel : system ;
+ AddHaikuImagePackages curl_devel ffmpeg_devel
freetype_devel
+ 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 ;
}
diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index df8b0e9..1d14859 100644
--- a/build/jam/images/HaikuImage
+++ b/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 ;
-AddFilesToHaikuImage common settings etc profile.d : $(profileFiles) ;
+AddDirectoryToHaikuImage system settings etc profile.d ;
+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 common etc bash_completion.d helpers ;
-#AddFilesToHaikuImage common etc bash_completion.d : $(bashCompletionFiles) ;
-#AddFilesToHaikuImage common etc bash_completion.d helpers
+#AddDirectoryToHaikuImage system etc bash_completion.d ;
+#AddDirectoryToHaikuImage system etc bash_completion.d helpers ;
+#AddFilesToHaikuImage system etc bash_completion.d : $(bashCompletionFiles) ;
+#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 ] ;
-AddFilesToHaikuImage common settings : <post-install>fresh_install ;
+ = [ FDirName $(HAIKU_TOP) data system settings ] ;
+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 common non-packaged ;
-AddDirectoryToHaikuImage common var empty ;
-AddDirectoryToHaikuImage common var log ;
+AddDirectoryToHaikuImage system cache tmp ;
+AddDirectoryToHaikuImage system non-packaged ;
+AddDirectoryToHaikuImage system var empty ;
+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=) ;
}
diff --git a/build/jam/images/HaikuImageBootstrap
b/build/jam/images/HaikuImageBootstrap
index ebf7d14..fb50897 100644
--- a/build/jam/images/HaikuImageBootstrap
+++ b/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 ;
-AddFilesToHaikuImage common settings etc profile.d : $(profileFiles) ;
+AddDirectoryToHaikuImage system settings etc profile.d ;
+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 ] ;
-AddFilesToHaikuImage common settings : <post-install>fresh_install ;
+ = [ FDirName $(HAIKU_TOP) data system settings ] ;
+AddFilesToHaikuImage system settings : <post-install>fresh_install ;
# create directories that will remain empty
-AddDirectoryToHaikuImage common cache tmp ;
-AddDirectoryToHaikuImage common non-packaged ;
-AddDirectoryToHaikuImage common var empty ;
-AddDirectoryToHaikuImage common var log ;
+AddDirectoryToHaikuImage system cache tmp ;
+AddDirectoryToHaikuImage system non-packaged ;
+AddDirectoryToHaikuImage system var empty ;
+AddDirectoryToHaikuImage system var log ;
AddDirectoryToHaikuImage home Desktop ;
AddDirectoryToHaikuImage home mail ;
AddDirectoryToHaikuImage home config packages ;
diff --git a/build/jam/images/HaikuImageCommon
b/build/jam/images/HaikuImageCommon
index 9de8791..27e14a7 100644
--- a/build/jam/images/HaikuImageCommon
+++ b/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) ;
}
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index fa75457..4d42e88 100644
--- a/build/jam/packages/Haiku
+++ b/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
diff --git a/build/jam/packages/HaikuBootstrap
b/build/jam/packages/HaikuBootstrap
index 491ebae..b982eb4 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/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
diff --git a/build/scripts/build_haiku_image b/build/scripts/build_haiku_image
index 19fac63..0cf41a6 100755
--- a/build/scripts/build_haiku_image
+++ b/build/scripts/build_haiku_image
@@ -6,8 +6,7 @@ set -o errexit
# outputDir
# tmpDir
# addBuildCompatibilityLibDir
-# systemPackages, commonPackages - lists of the hpkg packages copied/updated
-# (in "system" and "common" respectively)
+# systemPackages - lists of the hpkg packages copied/updated
# 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
diff --git a/data/bin/install-wifi-firmwares.sh
b/data/bin/install-wifi-firmwares.sh
index e7c8abc..b4458d2 100755
--- a/data/bin/install-wifi-firmwares.sh
+++ b/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."
diff --git a/data/etc/profile.d/bash_completion.sh
b/data/etc/profile.d/bash_completion.sh
index 56da28e..9fd25c4 100644
--- a/data/etc/profile.d/bash_completion.sh
+++ b/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
diff --git a/data/settings/network/services b/data/settings/network/services
index fec2ea5..cd92d23 100644
--- a/data/settings/network/services
+++ b/data/settings/network/services
@@ -7,6 +7,6 @@
#}
service ssh {
- launch /boot/common/bin/sshd -D
+ launch /boot/system/bin/sshd -D
stand_alone
}
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index 9fd1b18..a6af7f0 100644
--- a/data/system/boot/Bootscript
+++ b/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
diff --git a/data/system/boot/InstallerFinishScript
b/data/system/boot/InstallerFinishScript
index f115aec..db50477 100644
--- a/data/system/boot/InstallerFinishScript
+++ b/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"
diff --git a/data/system/boot/SetupEnvironment
b/data/system/boot/SetupEnvironment
index 18eb0e2..af3cc51 100644
--- a/data/system/boot/SetupEnvironment
+++ b/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
LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/common/non-packaged/lib:/boot/common/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
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/system/non-packaged/lib:/boot/system/lib"
+ 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
diff --git a/data/common/boot/post_install/add_catalog_entry_attributes.sh
b/data/system/boot/post_install/add_catalog_entry_attributes.sh
similarity index 100%
rename from data/common/boot/post_install/add_catalog_entry_attributes.sh
rename to data/system/boot/post_install/add_catalog_entry_attributes.sh
diff --git a/data/common/boot/post_install/default_deskbar_items.sh
b/data/system/boot/post_install/default_deskbar_items.sh
similarity index 100%
rename from data/common/boot/post_install/default_deskbar_items.sh
rename to data/system/boot/post_install/default_deskbar_items.sh
diff --git a/data/common/settings/fresh_install
b/data/system/settings/fresh_install
similarity index 100%
rename from data/common/settings/fresh_install
rename to data/system/settings/fresh_install
diff --git a/headers/private/system/directories.h
b/headers/private/system/directories.h
index 1645aee..9fe8bc1 100644
--- a/headers/private/system/directories.h
+++ b/headers/private/system/directories.h
@@ -13,16 +13,16 @@
#define kGlobalTempDirectory "/tmp"
#define kGlobalVarDirectory "/var"
-#define kAppsDirectory
"/boot/common/apps"
-#define kPreferencesDirectory "/boot/common/preferences"
+#define kAppsDirectory
"/boot/system/apps"
+#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"
-#define kVolumeLocalCommonKernelAddonsDirectory "common/add-ons/kernel"
+ "system/non-packaged/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 kCommonAddonsDirectory "/boot/common/add-ons"
-#define kCommonBinDirectory "/boot/common/bin"
-#define kCommonDevelopToolsBinDirectory
"/boot/common/develop/tools/current/bin"
-#define kCommonEtcDirectory "/boot/common/settings/etc"
-#define kCommonLibDirectory "/boot/common/lib"
-#define kCommonPackagesDirectory "/boot/common/packages"
-#define kCommonSettingsDirectory "/boot/common/settings"
-#define kCommonTempDirectory "/boot/common/cache/tmp"
-#define kCommonVarDirectory "/boot/common/var"
-#define kCommonLogDirectory "/boot/common/var/log"
-#define kCommonNonpackagedAddonsDirectory
"/boot/common/non-packaged/add-ons"
-#define kCommonNonpackagedBinDirectory "/boot/common/non-packaged/bin"
-#define kCommonNonpackagedLibDirectory "/boot/common/non-packaged/lib"
+#define kCommonDirectory "/boot/system"
+#define kCommonAddonsDirectory "/boot/system/add-ons"
+#define kCommonBinDirectory "/boot/system/bin"
+#define kCommonDevelopToolsBinDirectory
"/boot/system/develop/tools/current/bin"
+#define kCommonEtcDirectory "/boot/system/settings/etc"
+#define kCommonLibDirectory "/boot/system/lib"
+#define kCommonPackagesDirectory "/boot/system/packages"
+#define kCommonSettingsDirectory "/boot/system/settings"
+#define kCommonTempDirectory "/boot/system/cache/tmp"
+#define kCommonVarDirectory "/boot/system/var"
+#define kCommonLogDirectory "/boot/system/var/log"
+#define kCommonNonpackagedAddonsDirectory
"/boot/system/non-packaged/add-ons"
+#define kCommonNonpackagedBinDirectory "/boot/system/non-packaged/bin"
+#define kCommonNonpackagedLibDirectory "/boot/system/non-packaged/lib"
#define kUserDirectory "/boot/home"
#define kUserConfigDirectory "/boot/home/config"
diff --git a/src/add-ons/accelerants/radeon_hd/bios.cpp
b/src/add-ons/accelerants/radeon_hd/bios.cpp
index 5a2b776..4d29bb0 100644
--- a/src/add-ons/accelerants/radeon_hd/bios.cpp
+++ b/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");
diff --git a/src/add-ons/index_server/fulltext/FullTextAnalyser.cpp
b/src/add-ons/index_server/fulltext/FullTextAnalyser.cpp
index e1e9c23..6330806 100644
--- a/src/add-ons/index_server/fulltext/FullTextAnalyser.cpp
+++ b/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;
diff --git
a/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp
b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp
index ec287cf..effb320 100644
---
a/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp
+++
b/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"
}
diff --git a/src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp
b/src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp
index 18f668a..2f1ba56 100644
--- a/src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp
+++ b/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[] = {
- "packages", NULL
-};
-const char* const kCommonShineThroughDirectories[] = {
+const char* const kShineThroughDirectories[] = {
"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
diff --git a/src/add-ons/media/plugins/ffmpeg/config.h
b/src/add-ons/media/plugins/ffmpeg/config.h
index 0dbe8a2..9f3dfb9 100644
--- a/src/add-ons/media/plugins/ffmpeg/config.h
+++ b/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__
diff --git a/src/add-ons/print/drivers/pdf/doc/Create_Report_Mail.sh
b/src/add-ons/print/drivers/pdf/doc/Create_Report_Mail.sh
index 3710923..885e99d 100755
--- a/src/add-ons/print/drivers/pdf/doc/Create_Report_Mail.sh
+++ b/src/add-ons/print/drivers/pdf/doc/Create_Report_Mail.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-/boot/common/apps/BeMail mailto:philippe.houdoin@xxxxxxx -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:philippe.houdoin@xxxxxxx -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:
diff --git a/src/apps/autoraise/AutoRaise.txt b/src/apps/autoraise/AutoRaise.txt
index 19ab78f..942f3f0 100644
--- a/src/apps/autoraise/AutoRaise.txt
+++ b/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.
diff --git a/src/apps/installer/WorkerThread.cpp
b/src/apps/installer/WorkerThread.cpp
index d2d1550..f19fe42 100644
--- a/src/apps/installer/WorkerThread.cpp
+++ b/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("common/var/shared_memory");
+ fIgnorePaths.insert("system/var/swap");
+ 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);
}
}
diff --git a/src/bin/bash/Jamfile b/src/bin/bash/Jamfile
index 240632c..85efaed 100644
--- a/src/bin/bash/Jamfile
+++ b/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)\"' ;
diff --git a/src/bin/bash/config-top.h b/src/bin/bash/config-top.h
index 2aac37f..0c90764 100644
--- a/src/bin/bash/config-top.h
+++ b/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" \
- ":/bin:/boot/common/apps:/boot/common/preferences" \
+ ":/boot/system/non-packaged/bin" \
+ ":/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" \
- ":/bin:/boot/common/apps:/boot/common/preferences" \
+ ":/boot/system/non-packaged/bin" \
+ ":/bin:/boot/system/non-packaged/apps:/boot/system/non-packaged/preferences"
\
":/boot/system/apps" \
":/boot/system/preferences"
#endif
diff --git a/src/bin/bash/pathnames.h b/src/bin/bash/pathnames.h
index 42288f5..baf3a24 100644
--- a/src/bin/bash/pathnames.h
+++ b/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 */
diff --git a/src/bin/coreutils/INSTALL b/src/bin/coreutils/INSTALL
index 81fd332..1dc9bab 100644
--- a/src/bin/coreutils/INSTALL
+++ b/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
==========================
diff --git a/src/bin/coreutils/lib/configmake.h
b/src/bin/coreutils/lib/configmake.h
index 6a03268..370c0a6 100644
--- a/src/bin/coreutils/lib/configmake.h
+++ b/src/bin/coreutils/lib/configmake.h
@@ -1,26 +1,26 @@
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-#define PREFIX "/boot/common"
-#define EXEC_PREFIX "/boot/common"
-#define BINDIR "/boot/common/bin"
-#define SBINDIR "/boot/common/sbin"
-#define LIBEXECDIR "/boot/common/libexec"
-#define DATAROOTDIR "/boot/common/share"
-#define DATADIR "/boot/common/share"
-#define SYSCONFDIR "/boot/common/etc"
-#define SHAREDSTATEDIR "/boot/common/com"
-#define LOCALSTATEDIR "/boot/common/var"
-#define INCLUDEDIR "/boot/common/include"
-#define OLDINCLUDEDIR "/usr/include"
-#define DOCDIR "/boot/common/share/doc/coreutils"
-#define INFODIR "/boot/common/share/info"
-#define HTMLDIR "/boot/common/share/doc/coreutils"
-#define DVIDIR "/boot/common/share/doc/coreutils"
-#define PDFDIR "/boot/common/share/doc/coreutils"
-#define PSDIR "/boot/common/share/doc/coreutils"
-#define LIBDIR "/boot/common/lib"
-#define LOCALEDIR "/boot/common/share/locale"
-#define MANDIR "/boot/common/share/man"
-#define PKGDATADIR "/boot/common/share/coreutils"
-#define PKGINCLUDEDIR "/boot/common/include/coreutils"
-#define PKGLIBDIR "/boot/common/lib/coreutils"
-#define PKGLIBEXECDIR "/boot/common/libexec/coreutils"
+#define PREFIX "/boot/system"
+#define EXEC_PREFIX "/boot/system"
+#define BINDIR "/boot/system/bin"
+#define SBINDIR "/boot/system/bin"
+#define LIBEXECDIR "/boot/system/lib"
+#define DATAROOTDIR "/boot/system/data"
+#define DATADIR "/boot/system/data"
+#define SYSCONFDIR "/boot/system/settings/etc"
+#define SHAREDSTATEDIR "/boot/system/var"
+#define LOCALSTATEDIR "/boot/system/var"
+#define INCLUDEDIR "/boot/system/develop/headers"
+#define OLDINCLUDEDIR "/boot/system/develop/headers"
+#define DOCDIR "/boot/system/documentation/coreutils"
+#define INFODIR "/boot/system/documentation/info"
+#define HTMLDIR "/boot/system/documentation/coreutils"
+#define DVIDIR "/boot/system/documentation/coreutils"
+#define PDFDIR "/boot/system/documentation/coreutils"
+#define PSDIR "/boot/system/documentation/coreutils"
+#define LIBDIR "/boot/system/lib"
+#define LOCALEDIR "/boot/system/data/locale"
+#define MANDIR "/boot/system/documentation/man"
+#define PKGDATADIR "/boot/system/data/coreutils"
+#define PKGINCLUDEDIR "/boot/system/develop/headers/coreutils"
+#define PKGLIBDIR "/boot/system/lib/coreutils"
+#define PKGLIBEXECDIR "/boot/system/lib/coreutils"
diff --git a/src/bin/findutils/locate/Jamfile b/src/bin/findutils/locate/Jamfile
index a735ff1..c57aa5e 100644
--- a/src/bin/findutils/locate/Jamfile
+++ b/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,@libexecdir@,/bin," \
+ -e "s,/usr/bin,/boot/system/bin," \
+ -e "s,@libexecdir@,/lib," \
-e "s,@LOCATE_DB@,/var/locatedb," \
-e "s,@VERSION@,4.2.33," \
-e "s,@find@,find," \
diff --git a/src/bin/network/wget/src/version.c
b/src/bin/network/wget/src/version.c
index d674724..bfd0542 100644
--- a/src/bin/network/wget/src/version.c
+++ b/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 *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 *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/system/lib/libiconv.so -Wl,-rpath -Wl,/boot/system/lib ftp-opie.o
gen-md5.o ../lib/libgnu.a ../md5/libmd5.a";
diff --git a/src/build/libroot/find_directory.cpp
b/src/build/libroot/find_directory.cpp
index 061ecf7..4c9f746 100644
--- a/src/build/libroot/find_directory.cpp
+++ b/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";
diff --git a/src/data/deskbar/menu_entries b/src/data/deskbar/menu_entries
index 3576dec..8ae434b 100644
--- a/src/data/deskbar/menu_entries
+++ b/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/common/data/deskbar/menu
+directory /boot/system/non-packaged/data/deskbar/menu
directory /boot/system/data/deskbar/menu
diff --git a/src/kits/media/DormantNodeManager.cpp
b/src/kits/media/DormantNodeManager.cpp
index 4f9274f..e66c366 100644
--- a/src/kits/media/DormantNodeManager.cpp
+++ b/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.
diff --git a/src/libs/expat/xmlwf/xmlwf b/src/libs/expat/xmlwf/xmlwf
index f7b60af..53170c0 100755
--- a/src/libs/expat/xmlwf/xmlwf
+++ b/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-p
rototypes -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_CON
FIG_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
diff --git a/src/libs/iconv/config.h b/src/libs/iconv/config.h
index 75605d2..f2f7e36 100644
--- a/src/libs/iconv/config.h
+++ b/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
diff --git a/src/libs/ncurses/include/ncurses_cfg.h
b/src/libs/ncurses/include/ncurses_cfg.h
index 95a7b68..64ab1de 100644
--- a/src/libs/ncurses/include/ncurses_cfg.h
+++ b/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 "/boot/common/data/terminfo"
+#define TERMINFO_DIRS "/boot/system/data/terminfo"
+#define TERMINFO "/boot/system/data/terminfo"
#define TERMPATH "/etc/termcap"
#define HAVE_BIG_CORE 1
#define PURE_TERMINFO 1
diff --git a/src/libs/print/libgutenprint/INSTALL
b/src/libs/print/libgutenprint/INSTALL
index 7d1c323..a1d7841 100644
--- a/src/libs/print/libgutenprint/INSTALL
+++ b/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
==========================
diff --git a/src/preferences/printers/doxygen.cfg
b/src/preferences/printers/doxygen.cfg
index 3af7669..1c42d32 100644
--- a/src/preferences/printers/doxygen.cfg
+++ b/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
diff --git a/src/servers/package/Root.cpp b/src/servers/package/Root.cpp
index 71efbf2..8c3c3c0 100644
--- a/src/servers/package/Root.cpp
+++ b/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()
{
diff --git a/src/servers/package/Root.h b/src/servers/package/Root.h
index ed8441b..de4bde3 100644
--- a/src/servers/package/Root.h
+++ b/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();
diff --git a/src/servers/package/Volume.cpp b/src/servers/package/Volume.cpp
index 4d18629..8b470c6 100644
--- a/src/servers/package/Volume.cpp
+++ b/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
- // "system" where it is "common".
+ // extract the files -- that's the volume's root directory.
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 "
@@ -2241,41 +2240,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)
{
diff --git a/src/servers/package/Volume.h b/src/servers/package/Volume.h
index f6790c6..9ad756b 100644
--- a/src/servers/package/Volume.h
+++ b/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;
};
diff --git a/src/system/libroot/os/find_directory.cpp
b/src/system/libroot/os/find_directory.cpp
index 481d084..045c86d 100644
--- a/src/system/libroot/os/find_directory.cpp
+++ b/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"
diff --git a/src/tests/add-ons/kernel/file_systems/fs_shell/fsh.cpp
b/src/tests/add-ons/kernel/file_systems/fs_shell/fsh.cpp
index 8c3a237..894fe02 100644
--- a/src/tests/add-ons/kernel/file_systems/fs_shell/fsh.cpp
+++ b/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>");
diff --git a/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp
b/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp
index 93f471e..5020813 100644
--- a/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp
+++ b/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";
/*
diff --git a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
index 3344fae..523f20f 100644
--- a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
+++ b/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;
diff --git a/src/tests/kits/net/preflet/ServicesAddOn/ServicesAddOn.cpp
b/src/tests/kits/net/preflet/ServicesAddOn/ServicesAddOn.cpp
index fc8ac22..2830b02 100644
--- a/src/tests/kits/net/preflet/ServicesAddOn/ServicesAddOn.cpp
+++ b/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;
diff --git a/src/tests/kits/storage/FindDirectoryTest.cpp
b/src/tests/kits/storage/FindDirectoryTest.cpp
index c6b77c9..a8934f6 100644
--- a/src/tests/kits/storage/FindDirectoryTest.cpp
+++ b/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");
############################################################################
Commit: ded25be1979db83060a21d11762502c178c77af9
URL: http://cgit.haiku-os.org/haiku/commit/?id=ded25be
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Oct 3 18:12:06 2013 UTC
runtime loader: 64-bit ktrace output fixes
----------------------------------------------------------------------------
diff --git a/src/system/runtime_loader/elf.cpp
b/src/system/runtime_loader/elf.cpp
index edaf863..430ee9f 100644
--- a/src/system/runtime_loader/elf.cpp
+++ b/src/system/runtime_loader/elf.cpp
@@ -97,14 +97,14 @@ load_immediate_dependencies(image_t *image)
if (image->num_needed == 0)
return B_OK;
- KTRACE("rld: load_dependencies(\"%s\", id: %ld)", image->name,
+ KTRACE("rld: load_dependencies(\"%s\", id: %" B_PRId32 ")", image->name,
image->id);
image->needed = (image_t**)malloc(image->num_needed * sizeof(image_t
*));
if (image->needed == NULL) {
FATAL("%s: Failed to allocate needed struct\n", image->path);
- KTRACE("rld: load_dependencies(\"%s\", id: %ld) failed: no
memory",
- image->name, image->id);
+ KTRACE("rld: load_dependencies(\"%s\", id: %" B_PRId32
+ ") failed: no memory", image->name, image->id);
return B_NO_MEMORY;
}
@@ -132,8 +132,8 @@ load_immediate_dependencies(image_t *image)
// Collect all missing libraries in
case we report back
if (!reportErrors) {
- KTRACE("rld:
load_dependencies(\"%s\", id: %ld) "
- "failed: %s",
image->name, image->id,
+ KTRACE("rld:
load_dependencies(\"%s\", id: %" B_PRId32
+ ") failed: %s",
image->name, image->id,
strerror(status));
return status;
}
@@ -150,7 +150,7 @@ load_immediate_dependencies(image_t *image)
}
if (status < B_OK) {
- KTRACE("rld: load_dependencies(\"%s\", id: %ld) "
+ KTRACE("rld: load_dependencies(\"%s\", id: %" B_PRId32 ") "
"failed: %s", image->name, image->id,
strerror(status));
return status;
@@ -158,13 +158,13 @@ load_immediate_dependencies(image_t *image)
if (j != image->num_needed) {
FATAL("Internal error at load_dependencies()");
- KTRACE("rld: load_dependencies(\"%s\", id: %ld) "
+ KTRACE("rld: load_dependencies(\"%s\", id: %" B_PRId32 ") "
"failed: internal error", image->name, image->id);
return B_ERROR;
}
- KTRACE("rld: load_dependencies(\"%s\", id: %ld) done", image->name,
- image->id);
+ KTRACE("rld: load_dependencies(\"%s\", id: %" B_PRId32 ") done",
+ image->name, image->id);
return B_OK;
}
@@ -345,7 +345,7 @@ preload_image(char const* path)
add_add_on(image, addOnStruct);
}
- KTRACE("rld: preload_image(\"%s\") done: id: %ld", path, image->id);
+ KTRACE("rld: preload_image(\"%s\") done: id: %" B_PRId32, path,
image->id);
return image->id;
@@ -451,7 +451,7 @@ load_program(char const *path, void **_entry)
gProgramLoaded = true;
- KTRACE("rld: load_program(\"%s\") done: entry: %p, id: %ld", path,
+ KTRACE("rld: load_program(\"%s\") done: entry: %p, id: %" B_PRId32 ,
path,
*_entry, gProgramImage->id);
return gProgramImage->id;
@@ -487,7 +487,7 @@ load_library(char const *path, uint32 flags, bool addOn,
void** _handle)
if (path == NULL && addOn)
return B_BAD_VALUE;
- KTRACE("rld: load_library(\"%s\", 0x%lx, %d)", path, flags, addOn);
+ KTRACE("rld: load_library(\"%s\", %#" B_PRIx32 ", %d)", path, flags,
addOn);
rld_lock();
// for now, just do stupid simple global locking
@@ -509,8 +509,8 @@ load_library(char const *path, uint32 flags, bool addOn,
void** _handle)
if (image) {
atomic_add(&image->ref_count, 1);
rld_unlock();
- KTRACE("rld: load_library(\"%s\"): already loaded:
%ld", path,
- image->id);
+ KTRACE("rld: load_library(\"%s\"): already loaded: %"
B_PRId32,
+ path, image->id);
*_handle = image;
return image->id;
}
@@ -556,7 +556,7 @@ load_library(char const *path, uint32 flags, bool addOn,
void** _handle)
rld_unlock();
- KTRACE("rld: load_library(\"%s\") done: id: %ld", path, image->id);
+ KTRACE("rld: load_library(\"%s\") done: id: %" B_PRId32, path,
image->id);
*_handle = image;
return image->id;
diff --git a/src/system/runtime_loader/elf_load_image.cpp
b/src/system/runtime_loader/elf_load_image.cpp
index 63c4118..2b12538 100644
--- a/src/system/runtime_loader/elf_load_image.cpp
+++ b/src/system/runtime_loader/elf_load_image.cpp
@@ -556,8 +556,8 @@ load_image(char const* name, image_type type, const char*
rpath,
*_image = image;
- KTRACE("rld: load_container(\"%s\"): done: id: %ld (ABI: %#lx)", name,
- image->id, image->abi);
+ KTRACE("rld: load_container(\"%s\"): done: id: %" B_PRId32 " (ABI: %#"
+ B_PRIx32 ")", name, image->id, image->abi);
return B_OK;
############################################################################
Commit: 4b7e219688450694efc9d1890f83f816758c16d3
URL: http://cgit.haiku-os.org/haiku/commit/?id=4b7e219
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Oct 3 19:44:44 2013 UTC
Remove /boot/common for good
* Remove support for the "common" installation location from packagefs,
package kit, package daemon, package managers.
* Rename the B_COMMON_*_DIRECTORY constants referring to writable
directories to B_SYSTEM_*_DIRECTORY.
* Remove/adjust the use of various B_COMMON_*_DIRECTORY constants.
I'm sure some occurrence still remain. They can be adjusted when the
remaining B_COMMON_*_DIRECTORY constants are removed.
----------------------------------------------------------------------------
diff --git a/headers/os/package/PackageDefs.h b/headers/os/package/PackageDefs.h
index 1f18345..4d49fab 100644
--- a/headers/os/package/PackageDefs.h
+++ b/headers/os/package/PackageDefs.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2011, Haiku, Inc.
+ * Copyright 2011-2013, Haiku, Inc.
* Distributed under the terms of the MIT License.
*/
#ifndef _PACKAGE__PACKAGE_DEFS_H_
@@ -11,7 +11,6 @@ namespace BPackageKit {
enum BPackageInstallationLocation {
B_PACKAGE_INSTALLATION_LOCATION_SYSTEM,
- B_PACKAGE_INSTALLATION_LOCATION_COMMON,
B_PACKAGE_INSTALLATION_LOCATION_HOME,
B_PACKAGE_INSTALLATION_LOCATION_ENUM_COUNT
diff --git a/headers/os/storage/FindDirectory.h
b/headers/os/storage/FindDirectory.h
index 4f84e58..22a9ed5 100644
--- a/headers/os/storage/FindDirectory.h
+++ b/headers/os/storage/FindDirectory.h
@@ -42,33 +42,34 @@ typedef enum {
B_COMMON_LIB_DIRECTORY,
B_COMMON_SERVERS_DIRECTORY,
B_COMMON_BIN_DIRECTORY,
- B_COMMON_ETC_DIRECTORY,
+ B_SYSTEM_ETC_DIRECTORY,
B_COMMON_DOCUMENTATION_DIRECTORY,
- B_COMMON_SETTINGS_DIRECTORY,
+ B_SYSTEM_SETTINGS_DIRECTORY,
B_COMMON_DEVELOP_DIRECTORY,
- B_COMMON_LOG_DIRECTORY,
- B_COMMON_SPOOL_DIRECTORY,
- B_COMMON_TEMP_DIRECTORY,
- B_COMMON_VAR_DIRECTORY,
+ B_SYSTEM_LOG_DIRECTORY,
+ B_SYSTEM_SPOOL_DIRECTORY,
+ B_SYSTEM_TEMP_DIRECTORY,
+ B_SYSTEM_VAR_DIRECTORY,
B_COMMON_TRANSLATORS_DIRECTORY,
B_COMMON_MEDIA_NODES_DIRECTORY,
B_COMMON_SOUNDS_DIRECTORY,
B_COMMON_DATA_DIRECTORY,
- B_COMMON_CACHE_DIRECTORY,
+ B_SYSTEM_CACHE_DIRECTORY,
B_COMMON_PACKAGES_DIRECTORY,
B_COMMON_HEADERS_DIRECTORY,
- B_COMMON_NONPACKAGED_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_TRANSLATORS_DIRECTORY,
- B_COMMON_NONPACKAGED_MEDIA_NODES_DIRECTORY,
- B_COMMON_NONPACKAGED_BIN_DIRECTORY,
- B_COMMON_NONPACKAGED_DATA_DIRECTORY,
- B_COMMON_NONPACKAGED_FONTS_DIRECTORY,
- B_COMMON_NONPACKAGED_SOUNDS_DIRECTORY,
- B_COMMON_NONPACKAGED_DOCUMENTATION_DIRECTORY,
- B_COMMON_NONPACKAGED_LIB_DIRECTORY,
- B_COMMON_NONPACKAGED_HEADERS_DIRECTORY,
- B_COMMON_NONPACKAGED_DEVELOP_DIRECTORY,
+
+ B_SYSTEM_NONPACKAGED_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_TRANSLATORS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_MEDIA_NODES_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_BIN_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_DATA_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_SOUNDS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_DOCUMENTATION_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_LIB_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_HEADERS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_DEVELOP_DIRECTORY,
/* User directories. These are interpreted in the context
of the user making the find_directory call. */
diff --git a/headers/private/package/manager/PackageManager.h
b/headers/private/package/manager/PackageManager.h
index 5fc51d8..bdbaf40 100644
--- a/headers/private/package/manager/PackageManager.h
+++ b/headers/private/package/manager/PackageManager.h
@@ -67,8 +67,6 @@ public:
const InstalledRepository* SystemRepository() const
{
return fSystemRepository; }
- const InstalledRepository* CommonRepository() const
- {
return fCommonRepository; }
const InstalledRepository* HomeRepository() const
{
return fHomeRepository; }
const InstalledRepositoryList& InstalledRepositories()
const
@@ -139,7 +137,6 @@ protected:
BPackageInstallationLocation fLocation;
BSolver* fSolver;
InstalledRepository* fSystemRepository;
- InstalledRepository* fCommonRepository;
InstalledRepository* fHomeRepository;
InstalledRepositoryList fInstalledRepositories;
RemoteRepositoryList fOtherRepositories;
diff --git a/headers/private/package/packagefs.h
b/headers/private/package/packagefs.h
index 3737eee..fe063d3 100644
--- a/headers/private/package/packagefs.h
+++ b/headers/private/package/packagefs.h
@@ -14,7 +14,6 @@
enum PackageFSMountType {
PACKAGE_FS_MOUNT_TYPE_SYSTEM,
- PACKAGE_FS_MOUNT_TYPE_COMMON,
PACKAGE_FS_MOUNT_TYPE_HOME,
PACKAGE_FS_MOUNT_TYPE_CUSTOM,
diff --git a/src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp
b/src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp
index 2622663..cb471cc 100644
--- a/src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp
@@ -218,7 +218,7 @@ status_t
ReadSettings()
{
BPath path;
- status_t result = find_directory(B_COMMON_SETTINGS_DIRECTORY, &path);
+ status_t result = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path);
if (result != B_OK)
return result;
result = path.Append("nfs4_idmapper.conf");
diff --git
a/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp
b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp
index effb320..5d987d7 100644
---
a/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp
+++
b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp
@@ -21,12 +21,10 @@ static const char* const
kLinkPaths[PackageLinkSymlink::TYPE_ENUM_COUNT]
[PACKAGE_FS_MOUNT_TYPE_ENUM_COUNT] = {
{
"../..",
- "../../../common",
"../../../home/config"
},
{
"../../../system/settings",
- "../../../common/settings",
"../../../home/config/settings/global"
}
};
diff --git a/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp
b/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp
index b8ee286..affa199 100644
--- a/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp
@@ -95,7 +95,6 @@ PackageFSRoot::RegisterVolume(Volume* volume)
switch (volume->MountType()) {
case PACKAGE_FS_MOUNT_TYPE_SYSTEM:
- case PACKAGE_FS_MOUNT_TYPE_COMMON:
relativeRootPath = "..";
break;
case PACKAGE_FS_MOUNT_TYPE_HOME:
diff --git a/src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp
b/src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp
index 2f1ba56..3e99ba6 100644
--- a/src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp
@@ -467,9 +467,6 @@ Volume::Mount(const char* parameterString)
case PACKAGE_FS_MOUNT_TYPE_SYSTEM:
volumeName = "system";
break;
- case PACKAGE_FS_MOUNT_TYPE_COMMON:
- volumeName = "common";
- break;
case PACKAGE_FS_MOUNT_TYPE_HOME:
volumeName = "config";
break;
@@ -1611,8 +1608,6 @@ Volume::_InitMountType(const char* mountType)
fMountType = PACKAGE_FS_MOUNT_TYPE_CUSTOM;
else if (strcmp(mountType, "system") == 0)
fMountType = PACKAGE_FS_MOUNT_TYPE_SYSTEM;
- else if (strcmp(mountType, "common") == 0)
- fMountType = PACKAGE_FS_MOUNT_TYPE_COMMON;
else if (strcmp(mountType, "home") == 0)
fMountType = PACKAGE_FS_MOUNT_TYPE_HOME;
else if (strcmp(mountType, "custom") == 0)
@@ -1663,7 +1658,6 @@ Volume::_CreateShineThroughDirectories(const char*
shineThroughSetting)
// nothing specified -- derive from mount type
switch (fMountType) {
case PACKAGE_FS_MOUNT_TYPE_SYSTEM:
- case PACKAGE_FS_MOUNT_TYPE_COMMON:
case PACKAGE_FS_MOUNT_TYPE_HOME:
directories = kShineThroughDirectories;
break;
@@ -1674,8 +1668,6 @@ Volume::_CreateShineThroughDirectories(const char*
shineThroughSetting)
}
} else if (strcmp(shineThroughSetting, "system") == 0)
directories = kShineThroughDirectories;
- else if (strcmp(shineThroughSetting, "common") == 0)
- directories = kShineThroughDirectories;
else if (strcmp(shineThroughSetting, "home") == 0)
directories = kShineThroughDirectories;
else if (strcmp(shineThroughSetting, "none") == 0)
diff --git a/src/add-ons/locale/catalogs/plaintext/Catalog.cpp
b/src/add-ons/locale/catalogs/plaintext/Catalog.cpp
index f05d7bb..aefe570 100644
--- a/src/add-ons/locale/catalogs/plaintext/Catalog.cpp
+++ b/src/add-ons/locale/catalogs/plaintext/Catalog.cpp
@@ -97,7 +97,7 @@ PlainTextCatalog::PlainTextCatalog(const char *signature,
const char *language,
if (status != B_OK) {
// look in common-etc folder (/boot/home/config/etc):
BPath commonEtcPath;
- find_directory(B_COMMON_ETC_DIRECTORY, &commonEtcPath);
+ find_directory(B_SYSTEM_ETC_DIRECTORY, &commonEtcPath);
if (commonEtcPath.InitCheck() == B_OK) {
catalogName = BString(commonEtcPath.Path())
<< "/locale/" <<
kCatFolder
diff --git a/src/add-ons/print/drivers/pdf/source/PrinterPrefs.cpp
b/src/add-ons/print/drivers/pdf/source/PrinterPrefs.cpp
index 191d13e..b0243d2 100644
--- a/src/add-ons/print/drivers/pdf/source/PrinterPrefs.cpp
+++ b/src/add-ons/print/drivers/pdf/source/PrinterPrefs.cpp
@@ -65,7 +65,7 @@ PrinterPrefs::LoadSettings(BMessage *settings)
status_t status;
BFile file;
- status = find_directory(B_COMMON_SETTINGS_DIRECTORY, &fSettingsPath);
+ status = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &fSettingsPath);
if (status != B_OK) {
// Could not find settings folder.
return status;
diff --git a/src/apps/expander/ExpanderRules.cpp
b/src/apps/expander/ExpanderRules.cpp
index 70422e4..864427f 100644
--- a/src/apps/expander/ExpanderRules.cpp
+++ b/src/apps/expander/ExpanderRules.cpp
@@ -118,8 +118,7 @@ ExpanderRules::_LoadRulesFiles()
const directory_which kDirectories[] = {
B_USER_NONPACKAGED_DATA_DIRECTORY,
B_USER_DATA_DIRECTORY,
- B_COMMON_NONPACKAGED_DATA_DIRECTORY,
- B_COMMON_DATA_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_DATA_DIRECTORY,
B_SYSTEM_DATA_DIRECTORY
};
diff --git a/src/apps/haiku-depot/MainWindow.cpp
b/src/apps/haiku-depot/MainWindow.cpp
index 6c2ca93..f7aacdf 100644
--- a/src/apps/haiku-depot/MainWindow.cpp
+++ b/src/apps/haiku-depot/MainWindow.cpp
@@ -463,9 +463,6 @@ MainWindow::_RefreshPackageList()
manager.SystemRepository())) {
installationLocation = "system";
} else if (repository == static_cast<const
BSolverRepository*>(
- manager.CommonRepository())) {
- installationLocation = "common";
- } else if (repository == static_cast<const
BSolverRepository*>(
manager.HomeRepository())) {
installationLocation = "home";
}
diff --git a/src/apps/haiku-depot/PackageManager.cpp
b/src/apps/haiku-depot/PackageManager.cpp
index f4250ce..fe5a0e3 100644
--- a/src/apps/haiku-depot/PackageManager.cpp
+++ b/src/apps/haiku-depot/PackageManager.cpp
@@ -240,10 +240,8 @@ PackageManager::GetPackageActions(PackageInfoRef package,
Model* model)
if (repository == static_cast<const BSolverRepository*>(
SystemRepository())) {
installed = true;
- systemPackage = true;
- } else if (repository == static_cast<const BSolverRepository*>(
- CommonRepository())) {
- installed = true;
+// systemPackage = true;
+// TODO: Being installed in system doesn't make it a system package.
} else if (repository == static_cast<const BSolverRepository*>(
HomeRepository())) {
installed = true;
diff --git a/src/apps/login/DesktopWindow.cpp b/src/apps/login/DesktopWindow.cpp
index f0add9d..f28bd6c 100644
--- a/src/apps/login/DesktopWindow.cpp
+++ b/src/apps/login/DesktopWindow.cpp
@@ -45,7 +45,7 @@ DesktopWindow::DesktopWindow(BRect frame, bool editMode)
BPath path;
status_t err;
entry_ref ref;
- err = find_directory(B_COMMON_SETTINGS_DIRECTORY, &path, true);
+ err = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path, true);
if (err >= B_OK) {
BDirectory dir(path.Path());
if (!dir.Contains("x-vnd.Haiku-Login", B_DIRECTORY_NODE))
diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp
index 21b5cd7..bf41d56 100644
--- a/src/apps/mail/Content.cpp
+++ b/src/apps/mail/Content.cpp
@@ -1909,7 +1909,7 @@ TTextView::Open(hyper_text *enclosure)
case TYPE_BE_ENCLOSURE:
if (!enclosure->have_ref) {
BPath path;
- if (find_directory(B_COMMON_TEMP_DIRECTORY,
&path) == B_NO_ERROR) {
+ if (find_directory(B_SYSTEM_TEMP_DIRECTORY,
&path) == B_NO_ERROR) {
BDirectory dir(path.Path());
if (dir.InitCheck() == B_NO_ERROR) {
char name[B_FILE_NAME_LENGTH];
diff --git a/src/apps/soundrecorder/RecorderWindow.cpp
b/src/apps/soundrecorder/RecorderWindow.cpp
index 1e5c673..91f9ea4 100644
--- a/src/apps/soundrecorder/RecorderWindow.cpp
+++ b/src/apps/soundrecorder/RecorderWindow.cpp
@@ -214,7 +214,7 @@ RecorderWindow::InitWindow()
try {
// Find temp directory for recorded sounds.
BPath path;
- if (!(error = find_directory(B_COMMON_TEMP_DIRECTORY, &path)))
+ if (!(error = find_directory(B_SYSTEM_TEMP_DIRECTORY, &path)))
error = fTempDir.SetTo(path.Path());
if (error < 0)
goto bad_mojo;
diff --git a/src/apps/webpositive/BrowserWindow.cpp
b/src/apps/webpositive/BrowserWindow.cpp
index b833da0..bd61ff5 100644
--- a/src/apps/webpositive/BrowserWindow.cpp
+++ b/src/apps/webpositive/BrowserWindow.cpp
@@ -2364,7 +2364,7 @@ BrowserWindow::_HandlePageSourceResult(const BMessage*
message)
ret = message->FindString("source", &source);
if (ret == B_OK)
- ret = find_directory(B_COMMON_TEMP_DIRECTORY,
&pathToPageSource);
+ ret = find_directory(B_SYSTEM_TEMP_DIRECTORY,
&pathToPageSource);
BString tmpFileName("PageSource_");
tmpFileName << system_time() << ".html";
diff --git a/src/apps/workspaces/Workspaces.cpp
b/src/apps/workspaces/Workspaces.cpp
index 30f8f16..e9fc3e0 100644
--- a/src/apps/workspaces/Workspaces.cpp
+++ b/src/apps/workspaces/Workspaces.cpp
@@ -277,7 +277,7 @@ WorkspacesSettings::_Open(BFile& file, int mode)
BPath path;
status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
if (status != B_OK)
- status = find_directory(B_COMMON_SETTINGS_DIRECTORY, &path);
+ status = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path);
if (status != B_OK)
return status;
@@ -285,7 +285,7 @@ WorkspacesSettings::_Open(BFile& file, int mode)
status = file.SetTo(path.Path(), mode);
if (mode == B_READ_ONLY && status == B_ENTRY_NOT_FOUND) {
- if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) == B_OK)
{
+ if (find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path) == B_OK)
{
path.Append(kSettingsFile);
status = file.SetTo(path.Path(), mode);
}
diff --git a/src/bin/bash/bashline.c b/src/bin/bash/bashline.c
index d05087f..1f99b88 100644
--- a/src/bin/bash/bashline.c
+++ b/src/bin/bash/bashline.c
@@ -643,7 +643,7 @@ initialize_hostname_list ()
temp = get_string_value ("HOSTFILE");
if (temp == 0)
temp = get_string_value ("hostname_completion_file");
- if (temp == 0 && find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, path,
+ if (temp == 0 && find_directory(B_SYSTEM_SETTINGS_DIRECTORY, -1, false, path,
sizeof(path)) == B_OK) {
strlcat(path, "/network/hosts", sizeof(path));
temp = path;
diff --git a/src/bin/finddir.c b/src/bin/finddir.c
index 4c8a16e..3001ae2 100644
--- a/src/bin/finddir.c
+++ b/src/bin/finddir.c
@@ -60,33 +60,33 @@ directoryType directoryTypes[] = {
KEYVALUE_PAIR(B_COMMON_LIB_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_SERVERS_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_BIN_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_ETC_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_ETC_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_DOCUMENTATION_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_SETTINGS_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_SETTINGS_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_DEVELOP_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_LOG_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_SPOOL_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_TEMP_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_VAR_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_LOG_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_SPOOL_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_TEMP_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_VAR_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_TRANSLATORS_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_MEDIA_NODES_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_SOUNDS_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_DATA_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_CACHE_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_CACHE_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_PACKAGES_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_HEADERS_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_ADDONS_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_TRANSLATORS_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_MEDIA_NODES_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_BIN_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_DATA_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_FONTS_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_SOUNDS_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_DOCUMENTATION_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_LIB_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_HEADERS_DIRECTORY),
- KEYVALUE_PAIR(B_COMMON_NONPACKAGED_DEVELOP_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_TRANSLATORS_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_MEDIA_NODES_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_BIN_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_DATA_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_SOUNDS_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_DOCUMENTATION_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_LIB_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_HEADERS_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_NONPACKAGED_DEVELOP_DIRECTORY),
// User directories
KEYVALUE_PAIR(B_USER_DIRECTORY),
diff --git a/src/bin/pkgman/command_install.cpp
b/src/bin/pkgman/command_install.cpp
index 2b5589a..e7b55db 100644
--- a/src/bin/pkgman/command_install.cpp
+++ b/src/bin/pkgman/command_install.cpp
@@ -34,10 +34,7 @@ static const char* const kLongUsage =
"Options:\n"
" -H, --home\n"
" Install the packages in the user's home directory. Default is to\n"
- " install in the common directory.\n"
- " -S, --system\n"
- " Install the packages in the system directory. Default is to\n"
- " install in the common directory.\n"
+ " install in the system directory.\n"
"\n";
@@ -49,18 +46,17 @@ int
InstallCommand::Execute(int argc, const char* const* argv)
{
BPackageInstallationLocation location
- = B_PACKAGE_INSTALLATION_LOCATION_COMMON;
+ = B_PACKAGE_INSTALLATION_LOCATION_SYSTEM;
while (true) {
static struct option sLongOptions[] = {
{ "help", no_argument, 0, 'h' },
{ "home", no_argument, 0, 'H' },
- { "system", no_argument, 0, 'S' },
{ 0, 0, 0, 0 }
};
opterr = 0; // don't print errors
- int c = getopt_long(argc, (char**)argv, "hHS", sLongOptions,
NULL);
+ int c = getopt_long(argc, (char**)argv, "hH", sLongOptions,
NULL);
if (c == -1)
break;
@@ -73,10 +69,6 @@ InstallCommand::Execute(int argc, const char* const* argv)
location = B_PACKAGE_INSTALLATION_LOCATION_HOME;
break;
- case 'S':
- location =
B_PACKAGE_INSTALLATION_LOCATION_SYSTEM;
- break;
-
default:
PrintUsageAndExit(true);
break;
diff --git a/src/bin/pkgman/command_search.cpp
b/src/bin/pkgman/command_search.cpp
index 37c8c4c..36b7945 100644
--- a/src/bin/pkgman/command_search.cpp
+++ b/src/bin/pkgman/command_search.cpp
@@ -190,9 +190,6 @@ SearchCommand::Execute(int argc, const char* const* argv)
packageManager.SystemRepository()))
installed = "system";
else if (package->Repository() == static_cast<const
BSolverRepository*>(
- packageManager.CommonRepository()))
- installed = "common";
- else if (package->Repository() == static_cast<const
BSolverRepository*>(
packageManager.HomeRepository()))
installed = "home";
diff --git a/src/bin/pkgman/command_uninstall.cpp
b/src/bin/pkgman/command_uninstall.cpp
index 43d3df5..be0a42e 100644
--- a/src/bin/pkgman/command_uninstall.cpp
+++ b/src/bin/pkgman/command_uninstall.cpp
@@ -34,10 +34,7 @@ static const char* const kLongUsage =
"Options:\n"
" -H, --home\n"
" Uninstall the packages from the user's home directory. Default is
to\n"
- " uninstall from the common directory.\n"
- " -S, --system\n"
- " Uninstall the packages from the system directory. Default is to\n"
- " uninstall from the common directory.\n"
+ " uninstall from the system directory.\n"
"\n";
@@ -49,18 +46,17 @@ int
UninstallCommand::Execute(int argc, const char* const* argv)
{
BPackageInstallationLocation location
- = B_PACKAGE_INSTALLATION_LOCATION_COMMON;
+ = B_PACKAGE_INSTALLATION_LOCATION_SYSTEM;
while (true) {
static struct option sLongOptions[] = {
{ "help", no_argument, 0, 'h' },
{ "home", no_argument, 0, 'H' },
- { "system", no_argument, 0, 'S' },
{ 0, 0, 0, 0 }
};
opterr = 0; // don't print errors
- int c = getopt_long(argc, (char**)argv, "hHS", sLongOptions,
NULL);
+ int c = getopt_long(argc, (char**)argv, "hH", sLongOptions,
NULL);
if (c == -1)
break;
@@ -73,10 +69,6 @@ UninstallCommand::Execute(int argc, const char* const* argv)
location = B_PACKAGE_INSTALLATION_LOCATION_HOME;
break;
- case 'S':
- location =
B_PACKAGE_INSTALLATION_LOCATION_SYSTEM;
- break;
-
default:
PrintUsageAndExit(true);
break;
diff --git a/src/bin/pkgman/command_update.cpp
b/src/bin/pkgman/command_update.cpp
index f8527f2..81802f1 100644
--- a/src/bin/pkgman/command_update.cpp
+++ b/src/bin/pkgman/command_update.cpp
@@ -35,10 +35,7 @@ static const char* const kLongUsage =
"Options:\n"
" -H, --home\n"
" Update the packages in the user's home directory. Default is to\n"
- " update in the common directory.\n"
- " -S, --system\n"
- " Update the packages in the system directory. Default is to\n"
- " update in the common directory.\n"
+ " update in the system directory.\n"
"\n";
@@ -50,18 +47,17 @@ int
UpdateCommand::Execute(int argc, const char* const* argv)
{
BPackageInstallationLocation location
- = B_PACKAGE_INSTALLATION_LOCATION_COMMON;
+ = B_PACKAGE_INSTALLATION_LOCATION_SYSTEM;
while (true) {
static struct option sLongOptions[] = {
{ "help", no_argument, 0, 'h' },
{ "home", no_argument, 0, 'H' },
- { "system", no_argument, 0, 'S' },
{ 0, 0, 0, 0 }
};
opterr = 0; // don't print errors
- int c = getopt_long(argc, (char**)argv, "hHS", sLongOptions,
NULL);
+ int c = getopt_long(argc, (char**)argv, "hH", sLongOptions,
NULL);
if (c == -1)
break;
@@ -74,10 +70,6 @@ UpdateCommand::Execute(int argc, const char* const* argv)
location = B_PACKAGE_INSTALLATION_LOCATION_HOME;
break;
- case 'S':
- location =
B_PACKAGE_INSTALLATION_LOCATION_SYSTEM;
- break;
-
default:
PrintUsageAndExit(true);
break;
diff --git a/src/build/libroot/find_directory.cpp
b/src/build/libroot/find_directory.cpp
index 4c9f746..5c42b26 100644
--- a/src/build/libroot/find_directory.cpp
+++ b/src/build/libroot/find_directory.cpp
@@ -64,13 +64,13 @@ find_directory(directory_which which, dev_t device, bool
createIt,
// we support only the handful of paths we need
const char* path;
switch (which) {
- case B_COMMON_TEMP_DIRECTORY:
+ case B_SYSTEM_TEMP_DIRECTORY:
path = HAIKU_BUILD_GENERATED_DIRECTORY "/tmp";
break;
- case B_COMMON_SETTINGS_DIRECTORY:
+ case B_SYSTEM_SETTINGS_DIRECTORY:
path = HAIKU_BUILD_GENERATED_DIRECTORY
"/system/settings";
break;
- case B_COMMON_CACHE_DIRECTORY:
+ case B_SYSTEM_CACHE_DIRECTORY:
path = HAIKU_BUILD_GENERATED_DIRECTORY "/system/cache";
break;
case B_USER_SETTINGS_DIRECTORY:
diff --git a/src/kits/network/libbind/irs/gen.c
b/src/kits/network/libbind/irs/gen.c
index bbfd3bf..2df3046 100644
--- a/src/kits/network/libbind/irs/gen.c
+++ b/src/kits/network/libbind/irs/gen.c
@@ -388,7 +388,7 @@ init_map_rules(struct gen_p *irs, const char *conf_file) {
FILE *conf;
if (conf_file == NULL) {
- if (find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, path,
+ if (find_directory(B_SYSTEM_SETTINGS_DIRECTORY, -1, false, path,
sizeof(path)) == B_OK) {
strlcat(path, "/network/irs.conf", sizeof(path));
conf_file = path;
diff --git a/src/kits/network/libbind/irs/lcl_ho.c
b/src/kits/network/libbind/irs/lcl_ho.c
index e15d3a7..8d25408 100644
--- a/src/kits/network/libbind/irs/lcl_ho.c
+++ b/src/kits/network/libbind/irs/lcl_ho.c
@@ -449,7 +449,7 @@ ho_rewind(struct irs_ho *this) {
(void)fclose(pvt->fp);
}
- if (find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, path,
+ if (find_directory(B_SYSTEM_SETTINGS_DIRECTORY, -1, false, path,
sizeof(path)) == B_OK) {
strlcat(path, "/network/hosts", sizeof(path));
diff --git a/src/kits/network/libbind/resolv/res_init.c
b/src/kits/network/libbind/resolv/res_init.c
index 213e8d9..f488739 100644
--- a/src/kits/network/libbind/resolv/res_init.c
+++ b/src/kits/network/libbind/resolv/res_init.c
@@ -311,7 +311,7 @@ __res_vinit(res_state statp, int preinit) {
(line[sizeof(name) - 1] == ' ' || \
line[sizeof(name) - 1] == '\t'))
- if (find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, path,
+ if (find_directory(B_SYSTEM_SETTINGS_DIRECTORY, -1, false, path,
sizeof(path)) == B_OK)
strlcat(path, "/network/resolv.conf", sizeof(path));
diff --git a/src/kits/opengl/GLRendererRoster.cpp
b/src/kits/opengl/GLRendererRoster.cpp
index 739dc2b..0e7a925 100644
--- a/src/kits/opengl/GLRendererRoster.cpp
+++ b/src/kits/opengl/GLRendererRoster.cpp
@@ -99,8 +99,7 @@ GLRendererRoster::AddDefaultPaths()
const directory_which paths[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY,
};
diff --git a/src/kits/package/Context.cpp b/src/kits/package/Context.cpp
index eb18acc..4b1f7c4 100644
--- a/src/kits/package/Context.cpp
+++ b/src/kits/package/Context.cpp
@@ -96,7 +96,7 @@ BContext::_Initialize()
return B_NO_MEMORY;
BPath tempPath;
- status_t result = find_directory(B_COMMON_TEMP_DIRECTORY, &tempPath,
true);
+ status_t result = find_directory(B_SYSTEM_TEMP_DIRECTORY, &tempPath,
true);
if (result != B_OK)
return result;
BDirectory tempDirectory(tempPath.Path());
diff --git a/src/kits/package/PackageRoster.cpp
b/src/kits/package/PackageRoster.cpp
index 14f5c26..048b36d 100644
--- a/src/kits/package/PackageRoster.cpp
+++ b/src/kits/package/PackageRoster.cpp
@@ -53,7 +53,7 @@ BPackageRoster::~BPackageRoster()
status_t
BPackageRoster::GetCommonRepositoryConfigPath(BPath* path, bool create) const
{
- return _GetRepositoryPath(path, create, B_COMMON_SETTINGS_DIRECTORY);
+ return _GetRepositoryPath(path, create, B_SYSTEM_SETTINGS_DIRECTORY);
}
@@ -67,7 +67,7 @@ BPackageRoster::GetUserRepositoryConfigPath(BPath* path, bool
create) const
status_t
BPackageRoster::GetCommonRepositoryCachePath(BPath* path, bool create) const
{
- return _GetRepositoryPath(path, create, B_COMMON_CACHE_DIRECTORY);
+ return _GetRepositoryPath(path, create, B_SYSTEM_CACHE_DIRECTORY);
}
diff --git a/src/kits/package/manager/PackageManager.cpp
b/src/kits/package/manager/PackageManager.cpp
index 810e4b5..7b06dca 100644
--- a/src/kits/package/manager/PackageManager.cpp
+++ b/src/kits/package/manager/PackageManager.cpp
@@ -52,8 +52,6 @@ BPackageManager::BPackageManager(BPackageInstallationLocation
location)
fSolver(NULL),
fSystemRepository(new (std::nothrow) InstalledRepository("system",
B_PACKAGE_INSTALLATION_LOCATION_SYSTEM, -1)),
- fCommonRepository(new (std::nothrow) InstalledRepository("common",
- B_PACKAGE_INSTALLATION_LOCATION_COMMON, -2)),
fHomeRepository(new (std::nothrow) InstalledRepository("home",
B_PACKAGE_INSTALLATION_LOCATION_HOME, -3)),
fInstalledRepositories(10),
@@ -69,7 +67,6 @@ BPackageManager::~BPackageManager()
{
delete fSolver;
delete fSystemRepository;
- delete fCommonRepository;
delete fHomeRepository;
}
@@ -85,10 +82,8 @@ BPackageManager::Init(uint32 flags)
if (error != B_OK)
DIE(error, "failed to create solver");
- if (fSystemRepository == NULL || fCommonRepository == NULL
- || fHomeRepository == NULL) {
+ if (fSystemRepository == NULL || fHomeRepository == NULL)
throw std::bad_alloc();
- }
// add installation location repositories
if ((flags & B_ADD_INSTALLED_REPOSITORIES) != 0) {
@@ -103,12 +98,8 @@ BPackageManager::Init(uint32 flags)
// well. But we can easily filter those out.
_AddInstalledRepository(fSystemRepository);
- if (!fSystemRepository->IsInstalled()) {
- _AddInstalledRepository(fCommonRepository);
-
- if (!fCommonRepository->IsInstalled())
- _AddInstalledRepository(fHomeRepository);
- }
+ if (!fSystemRepository->IsInstalled())
+ _AddInstalledRepository(fHomeRepository);
}
// add other repositories
@@ -597,8 +588,6 @@ BPackageManager::_ClonePackageFile(InstalledRepository*
repository,
directory_which packagesWhich;
if (repository == fSystemRepository) {
packagesWhich = B_SYSTEM_PACKAGES_DIRECTORY;
- } else if (repository == fCommonRepository) {
- packagesWhich = B_COMMON_PACKAGES_DIRECTORY;
} else {
DIE("don't know packages directory path for installation
location "
"\"%s\"", repository->Name().String());
@@ -732,15 +721,8 @@ bool
BPackageManager::_NextSpecificInstallationLocation()
{
if (fLocation == B_PACKAGE_INSTALLATION_LOCATION_SYSTEM) {
- fLocation = B_PACKAGE_INSTALLATION_LOCATION_COMMON;
- fSystemRepository->SetInstalled(false);
- _AddInstalledRepository(fCommonRepository);
- return true;
- }
-
- if (fLocation == B_PACKAGE_INSTALLATION_LOCATION_COMMON) {
fLocation = B_PACKAGE_INSTALLATION_LOCATION_HOME;
- fCommonRepository->SetInstalled(false);
+ fSystemRepository->SetInstalled(false);
_AddInstalledRepository(fHomeRepository);
return true;
}
diff --git a/src/kits/package/solver/SolverRepository.cpp
b/src/kits/package/solver/SolverRepository.cpp
index 60415c4..d88d763 100644
--- a/src/kits/package/solver/SolverRepository.cpp
+++ b/src/kits/package/solver/SolverRepository.cpp
@@ -121,12 +121,6 @@ BSolverRepository::SetTo(BAllInstallationLocations)
if (error != B_OK)
return error;
- error = AddPackages(B_PACKAGE_INSTALLATION_LOCATION_COMMON);
- if (error != B_OK) {
- Unset();
- return error;
- }
-
error = AddPackages(B_PACKAGE_INSTALLATION_LOCATION_HOME);
if (error != B_OK) {
Unset();
diff --git a/src/kits/print/PrintTransport.cpp
b/src/kits/print/PrintTransport.cpp
index 6f7a9e6..cc4f655 100644
--- a/src/kits/print/PrintTransport.cpp
+++ b/src/kits/print/PrintTransport.cpp
@@ -73,8 +73,7 @@ status_t PrintTransport::Open(BNode* printerFolder)
const directory_which paths[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY,
};
BPath path;
diff --git a/src/kits/print/Printer.cpp b/src/kits/print/Printer.cpp
index c589bef..f638c2d 100644
--- a/src/kits/print/Printer.cpp
+++ b/src/kits/print/Printer.cpp
@@ -406,8 +406,7 @@ BPrinter::_DriverPath() const
directory_which directories[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY
};
diff --git a/src/kits/print/PrinterDriverAddOn.cpp
b/src/kits/print/PrinterDriverAddOn.cpp
index 9e6f507..abdded4 100644
--- a/src/kits/print/PrinterDriverAddOn.cpp
+++ b/src/kits/print/PrinterDriverAddOn.cpp
@@ -170,12 +170,7 @@ PrinterDriverAddOn::FindPathToDriver(const char* driver,
BPath* path)
return B_OK;
result = ::TestForAddonExistence(driver,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
kPrinterDriverFolderName, *path);
- if (result == B_OK)
- return B_OK;
-
- result = ::TestForAddonExistence(driver, B_COMMON_ADDONS_DIRECTORY,
- kPrinterDriverFolderName, *path);
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
kPrinterDriverFolderName, *path);
if (result == B_OK)
return B_OK;
diff --git a/src/kits/screensaver/ScreenSaverRunner.cpp
b/src/kits/screensaver/ScreenSaverRunner.cpp
index 0178bbd..6cdff85 100644
--- a/src/kits/screensaver/ScreenSaverRunner.cpp
+++ b/src/kits/screensaver/ScreenSaverRunner.cpp
@@ -123,8 +123,7 @@ ScreenSaverRunner::_LoadAddOn()
directory_which which[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY,
};
BPath path;
diff --git a/src/kits/storage/disk_device/DiskDeviceRoster.cpp
b/src/kits/storage/disk_device/DiskDeviceRoster.cpp
index 59bdf2c..666f585 100644
--- a/src/kits/storage/disk_device/DiskDeviceRoster.cpp
+++ b/src/kits/storage/disk_device/DiskDeviceRoster.cpp
@@ -38,8 +38,7 @@
static const directory_which kAddOnDirs[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY,
};
/*! \brief Size of the kAddOnDirs array. */
diff --git a/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
b/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
index abecb65..d55bdbb 100644
--- a/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
+++ b/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
@@ -118,13 +118,10 @@ DiskSystemAddOnManager::LoadDiskSystems()
if (error == B_OK) {
error
- = _LoadAddOns(alreadyLoaded,
B_COMMON_NONPACKAGED_ADDONS_DIRECTORY);
+ = _LoadAddOns(alreadyLoaded,
B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY);
}
if (error == B_OK)
- error = _LoadAddOns(alreadyLoaded, B_COMMON_ADDONS_DIRECTORY);
-
- if (error == B_OK)
error = _LoadAddOns(alreadyLoaded, B_SYSTEM_ADDONS_DIRECTORY);
if (error != B_OK)
diff --git a/src/kits/storage/mime/database_support.cpp
b/src/kits/storage/mime/database_support.cpp
index ce1e0d0..ea68496 100644
--- a/src/kits/storage/mime/database_support.cpp
+++ b/src/kits/storage/mime/database_support.cpp
@@ -91,8 +91,7 @@ static const directory_which kBaseDirectoryConstants[] = {
B_USER_SETTINGS_DIRECTORY,
B_USER_NONPACKAGED_DATA_DIRECTORY,
B_USER_DATA_DIRECTORY,
- B_COMMON_NONPACKAGED_DATA_DIRECTORY,
- B_COMMON_DATA_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_DATA_DIRECTORY,
B_SYSTEM_DATA_DIRECTORY
};
diff --git a/src/kits/tracker/DeskWindow.cpp b/src/kits/tracker/DeskWindow.cpp
index a5ac08d..a83c2ab 100644
--- a/src/kits/tracker/DeskWindow.cpp
+++ b/src/kits/tracker/DeskWindow.cpp
@@ -274,8 +274,7 @@ BDeskWindow::InitAddonsList(bool update)
LoadAddOnDir(B_USER_NONPACKAGED_ADDONS_DIRECTORY, this,
fAddonsList);
LoadAddOnDir(B_USER_ADDONS_DIRECTORY, this, fAddonsList);
- LoadAddOnDir(B_COMMON_NONPACKAGED_ADDONS_DIRECTORY, this,
fAddonsList);
- LoadAddOnDir(B_COMMON_ADDONS_DIRECTORY, this, fAddonsList);
+ LoadAddOnDir(B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY, this,
fAddonsList);
LoadAddOnDir(B_SYSTEM_ADDONS_DIRECTORY, this, fAddonsList);
}
}
@@ -325,13 +324,7 @@ BDeskWindow::ApplyShortcutPreferences(bool update)
isInAddons =
command.FindFirst(path.Path()) == 0;
}
if (!isInAddons
- &&
(find_directory(B_COMMON_ADDONS_DIRECTORY, &path)
- == B_OK)) {
- path.Append("Tracker/");
- isInAddons =
command.FindFirst(path.Path()) == 0;
- }
- if (!isInAddons
- &&
(find_directory(B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
+ &&
(find_directory(B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
&path) == B_OK)) {
path.Append("Tracker/");
isInAddons =
command.FindFirst(path.Path()) == 0;
diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index 6373b52..dc0c2c7 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -658,12 +658,12 @@ ConfirmChangeIfWellKnownDirectory(const BEntry* entry,
"\n\nTo %toDoAction the home folder anyway, hold down
the "
"Shift key and click \"%toConfirmAction\"."));
} else if (DirectoryMatchesOrContains(entry, B_USER_CONFIG_DIRECTORY)
- || DirectoryMatchesOrContains(entry,
B_COMMON_SETTINGS_DIRECTORY)) {
+ || DirectoryMatchesOrContains(entry,
B_SYSTEM_SETTINGS_DIRECTORY)) {
if (DirectoryMatchesOrContains(entry, "beos_mime",
B_USER_SETTINGS_DIRECTORY)
|| DirectoryMatchesOrContains(entry, "beos_mime",
- B_COMMON_SETTINGS_DIRECTORY)) {
+ B_SYSTEM_SETTINGS_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the mime
settings, "
"%osName may not behave properly!\n\nAre you
sure you want "
@@ -676,7 +676,7 @@ ConfirmChangeIfWellKnownDirectory(const BEntry* entry,
"to do this?"));
requireOverride = false;
} else if (DirectoryMatches(entry, B_USER_SETTINGS_DIRECTORY)
- || DirectoryMatches(entry,
B_COMMON_SETTINGS_DIRECTORY)) {
+ || DirectoryMatches(entry,
B_SYSTEM_SETTINGS_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the settings
folder, "
"%osName may not behave properly!\n\nAre you
sure you want "
diff --git a/src/kits/translation/TranslatorRoster.cpp
b/src/kits/translation/TranslatorRoster.cpp
index a681db7..783d32b 100644
--- a/src/kits/translation/TranslatorRoster.cpp
+++ b/src/kits/translation/TranslatorRoster.cpp
@@ -332,8 +332,7 @@ BTranslatorRoster::Private::AddDefaultPaths()
const directory_which paths[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY,
};
diff --git a/src/libs/print/libprint/Transport.cpp
b/src/libs/print/libprint/Transport.cpp
index 59f37dc..0b082dc 100644
--- a/src/libs/print/libprint/Transport.cpp
+++ b/src/libs/print/libprint/Transport.cpp
@@ -44,8 +44,7 @@ Transport::Transport(const PrinterData *printerData)
const directory_which paths[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_BEOS_ADDONS_DIRECTORY,
};
BPath path;
diff --git a/src/preferences/joysticks/JoyWin.cpp
b/src/preferences/joysticks/JoyWin.cpp
index ed8b638..c67a478 100644
--- a/src/preferences/joysticks/JoyWin.cpp
+++ b/src/preferences/joysticks/JoyWin.cpp
@@ -558,7 +558,7 @@ JoyWin::_FindSettingString(const char* name, const char*
strPath)
path.Append(name);
fFileTempProbeJoystick = new BFile(path.Path(), B_READ_ONLY);
- //status_t err = find_directory(B_COMMON_ETC_DIRECTORY, &path);
+ //status_t err = find_directory(B_SYSTEM_ETC_DIRECTORY, &path);
// if (err == B_OK) {
//BString str(path.Path());
//str << "/joysticks/" << name;
diff --git a/src/preferences/mail/DNSQuery.cpp
b/src/preferences/mail/DNSQuery.cpp
index 4b638ea..d54c7a6 100644
--- a/src/preferences/mail/DNSQuery.cpp
+++ b/src/preferences/mail/DNSQuery.cpp
@@ -165,7 +165,7 @@ DNSTools::GetDNSServers(BObjectList<BString>* serverList)
line[sizeof(name) - 1] == '\t'))
BPath path;
- if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK)
+ if (find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path) != B_OK)
return B_ENTRY_NOT_FOUND;
path.Append("network/resolv.conf");
diff --git a/src/preferences/network/EthernetSettingsView.cpp
b/src/preferences/network/EthernetSettingsView.cpp
index e572e15..327a7c5 100644
--- a/src/preferences/network/EthernetSettingsView.cpp
+++ b/src/preferences/network/EthernetSettingsView.cpp
@@ -489,7 +489,7 @@ void
EthernetSettingsView::_SaveDNSConfiguration()
{
BPath path;
- if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK)
+ if (find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path) != B_OK)
return;
path.Append("network/resolv.conf");
@@ -610,7 +610,7 @@ EthernetSettingsView::_TriggerAutoConfig(const char* device)
status_t
EthernetSettingsView::_GetPath(const char* name, BPath& path)
{
- if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path, true) != B_OK)
+ if (find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path, true) != B_OK)
return B_ERROR;
path.Append("network");
diff --git a/src/preferences/printers/AddPrinterDialog.cpp
b/src/preferences/printers/AddPrinterDialog.cpp
index 114bec2..cf4c74a 100644
--- a/src/preferences/printers/AddPrinterDialog.cpp
+++ b/src/preferences/printers/AddPrinterDialog.cpp
@@ -287,8 +287,7 @@ AddPrinterDialog::_BuildGUI(int stage)
static directory_which gAddonDirs[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY,
};
diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp
b/src/preferences/screensaver/ScreenSaverWindow.cpp
index e4f4e81..9ff9272 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -712,8 +712,7 @@ ModulesView::PopulateScreenSaverList()
directory_which which[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY,
};
ScreenSaverItem* selectedItem = NULL;
diff --git a/src/servers/app/drawing/DWindowHWInterface.cpp
b/src/servers/app/drawing/DWindowHWInterface.cpp
index 17c7928..38b6c8a 100644
--- a/src/servers/app/drawing/DWindowHWInterface.cpp
+++ b/src/servers/app/drawing/DWindowHWInterface.cpp
@@ -467,8 +467,7 @@ DWindowHWInterface::_OpenAccelerant(int device)
const static directory_which dirs[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY
};
diff --git a/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
index fb6a6e2..9c70576 100644
--- a/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
+++ b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
@@ -275,8 +275,7 @@ AccelerantHWInterface::_OpenAccelerant(int device)
const static directory_which dirs[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
- B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
- B_COMMON_ADDONS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY
};
diff --git a/src/servers/index/IndexServer.cpp
b/src/servers/index/IndexServer.cpp
index 06e0ebd..7c55910 100644
[ *** diff truncated: 562 lines dropped *** ]
############################################################################
Commit: f6616e03c3f066ab1cb57364ea1e29491e33e9b8
URL: http://cgit.haiku-os.org/haiku/commit/?id=f6616e0
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Oct 3 19:47:10 2013 UTC
Update packages that hard-coded references to /boot/common
There are a few more (like gcc still including there respective search
paths), but those should be harmless and can be adjusted later.
----------------------------------------------------------------------------
############################################################################
Commit: 730939f2a72e99c89e4986c945fa75ebe31360cb
URL: http://cgit.haiku-os.org/haiku/commit/?id=730939f
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Oct 3 19:48:11 2013 UTC
Declare libicu* requirements in the haiku* packages
----------------------------------------------------------------------------
############################################################################
Commit: 6bbd7bf3a01b51d03b42089ee6c3ea4b73078320
URL: http://cgit.haiku-os.org/haiku/commit/?id=6bbd7bf
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Oct 3 19:49:02 2013 UTC
Make secondary haiku_devel package depend on the primary
Only the primary haiku_devel package contains the system headers.
----------------------------------------------------------------------------
############################################################################
Revision: hrev46167
Commit: 45b3329d9f364636fde8deb7000b81e60b60797e
URL: http://cgit.haiku-os.org/haiku/commit/?id=45b3329
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Oct 3 19:50:43 2013 UTC
Fix incorrect uses of getpwuid_r()
The function's behavior was recently fixed to succeed, but return a NULL
pointer, when the entry was not found. Fixes a crash in this case.
----------------------------------------------------------------------------
Other related posts:
