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:
Ingo Weinhold
2013-10-03 21:52:25 +02:00
parent bf9b153fcc
commit f73f5d4c42
53 changed files with 168 additions and 308 deletions
+1 -1
View File
@@ -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."
+2 -2
View File
@@ -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
+1 -1
View File
@@ -7,6 +7,6 @@
#}
service ssh {
launch /boot/common/bin/sshd -D
launch /boot/system/bin/sshd -D
stand_alone
}
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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"
+4 -4
View File
@@ -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