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.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
#!/bin/sh
|
||||
|
||||
WriteCatalogEntryAttribute()
|
||||
{
|
||||
# $1 : signature
|
||||
# $2 : path
|
||||
# $3 : context
|
||||
|
||||
if ! [ -e "$2" ]
|
||||
then
|
||||
mkdir --parents "$2"
|
||||
fi
|
||||
|
||||
addattr -t string SYS:NAME "$1:$3:$(basename "$2")" "$2"
|
||||
}
|
||||
|
||||
|
||||
WriteTrackerCatalogEntryAttribute()
|
||||
{
|
||||
WriteCatalogEntryAttribute "x-vnd.Haiku-libtracker" "$1" "$2"
|
||||
}
|
||||
|
||||
|
||||
WriteDeskbarCatalogEntryAttribute()
|
||||
{
|
||||
WriteCatalogEntryAttribute "x-vnd.Be-TSKB" "$1" "$2"
|
||||
}
|
||||
|
||||
|
||||
WriteMailCatalogEntryAttribute()
|
||||
{
|
||||
WriteCatalogEntryAttribute "x-vnd.Be-MAIL" "$1" "$2"
|
||||
}
|
||||
|
||||
|
||||
# TODO: Several of the directories are read-only, so this doesn't work.
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_APPS_DIRECTORY)" B_APPS_DIRECTORY
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_COMMON_DIRECTORY)" B_COMMON_DIRECTORY
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_COMMON_DEVELOP_DIRECTORY)" B_COMMON_DEVELOP_DIRECTORY
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DIRECTORY)" B_USER_DIRECTORY
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_DESKTOP_DIRECTORY)" B_DESKTOP_DIRECTORY
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_USER_CONFIG_DIRECTORY)" B_USER_CONFIG_DIRECTORY
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_USER_SETTINGS_DIRECTORY)/Tracker/Tracker New Templates" \
|
||||
"B_USER_SETTINGS_DIRECTORY/Tracker/Tracker New Templates"
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_PREFERENCES_DIRECTORY)" B_PREFERENCES_DIRECTORY
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_SYSTEM_DIRECTORY)" B_SYSTEM_DIRECTORY
|
||||
|
||||
WriteTrackerCatalogEntryAttribute \
|
||||
"$(finddir B_TRASH_DIRECTORY)" B_TRASH_DIRECTORY
|
||||
|
||||
|
||||
|
||||
WriteDeskbarCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DESKBAR_DIRECTORY)/Applications" "B_USER_DESKBAR_DIRECTORY/Applications"
|
||||
|
||||
WriteDeskbarCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DESKBAR_DIRECTORY)/Demos" "B_USER_DESKBAR_DIRECTORY/Demos"
|
||||
|
||||
WriteDeskbarCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DESKBAR_DIRECTORY)/Desktop applets" "B_USER_DESKBAR_DIRECTORY/Desktop applets"
|
||||
|
||||
WriteDeskbarCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DESKBAR_DIRECTORY)/Preferences" "B_USER_DESKBAR_DIRECTORY/Preferences"
|
||||
|
||||
|
||||
|
||||
WriteMailCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DIRECTORY)/mail" "B_USER_DIRECTORY/mail"
|
||||
|
||||
WriteMailCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DIRECTORY)/mail/draft" "B_USER_DIRECTORY/mail/draft"
|
||||
|
||||
WriteMailCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DIRECTORY)/mail/in" "B_USER_DIRECTORY/mail/in"
|
||||
|
||||
WriteMailCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DIRECTORY)/mail/out" "B_USER_DIRECTORY/mail/out"
|
||||
|
||||
WriteMailCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DIRECTORY)/mail/queries" "B_USER_DIRECTORY/mail/queries"
|
||||
|
||||
WriteMailCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DIRECTORY)/mail/sent" "B_USER_DIRECTORY/mail/sent"
|
||||
|
||||
WriteMailCatalogEntryAttribute \
|
||||
"$(finddir B_USER_DIRECTORY)/mail/spam" "B_USER_DIRECTORY/mail/spam"
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# install ProcessController, NetworkStatus & volume control in the Deskbar
|
||||
/boot/system/apps/ProcessController -deskbar
|
||||
/boot/system/apps/NetworkStatus --deskbar
|
||||
/boot/system/bin/desklink --add-volume
|
||||
@@ -0,0 +1 @@
|
||||
This file is only supposed to exist on fresh Haiku installations.
|
||||
Reference in New Issue
Block a user