projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to poppler-0.29.0
[hvlinux.git]
/
stage0
/
pre-install
diff --git
a/stage0/pre-install
b/stage0/pre-install
index
15c38a8
..
0d72afd
100755
(executable)
--- a/
stage0/pre-install
+++ b/
stage0/pre-install
@@
-3,12
+3,6
@@
set -o errexit
source ../functions/main
source ../functions/main
-# Making sure that this script was executed by the root user
-if [ "x${USER}" != "xroot" ]; then
- echo "You must be the superuser to install hvlinux."
- exit 1
-fi
-
# Making sure that the LFS directory is accessible
if [ ! -d ${LFS} ]; then
echo "LFS destination directory not found."
# Making sure that the LFS directory is accessible
if [ ! -d ${LFS} ]; then
echo "LFS destination directory not found."
@@
-27,7
+21,7
@@
if ! grep -q "lfs" /etc/passwd; then
fi
# Creating basic directories
fi
# Creating basic directories
-for subdir in tmp var tools cross-tools; do
+for subdir in
etc
tmp var tools cross-tools; do
dir=${LFS}/${subdir}
if [ ! -d ${dir} ]; then
install -dv ${dir}
dir=${LFS}/${subdir}
if [ ! -d ${dir} ]; then
install -dv ${dir}
@@
-36,17
+30,12
@@
done
chown -R lfs:lfs ${LFS}
chown -R lfs:lfs ${LFS}
-# Creating a link from the host root directory to LFS cross-tools directories
-for subdir in tools cross-tools; do
- ln -sfvT ${LFS}/${subdir} /${subdir}
-done
-
cat > /home/lfs/.bashrc << "EOF"
# Setting up the environment
set +h
umask 022
LC_ALL=POSIX
cat > /home/lfs/.bashrc << "EOF"
# Setting up the environment
set +h
umask 022
LC_ALL=POSIX
-PATH=
/cross-tools
/bin:/bin:/usr/bin
+PATH=
_CLFS_CROSS_TOOLS_PATH_
/bin:/bin:/usr/bin
HVMAKE="make -j ${MAKEJOBS}"
unset CFLAGS
HVMAKE="make -j ${MAKEJOBS}"
unset CFLAGS
@@
-55,6
+44,8
@@
unset CXXFLAGS
export LC_ALL PATH HVMAKE
EOF
export LC_ALL PATH HVMAKE
EOF
+sed -e "s@_CLFS_CROSS_TOOLS_PATH_@${CROSS_TOOLS_DIR}@" -i /home/lfs/.bashrc
+
chown lfs:lfs /home/lfs/.bashrc
exit $?
chown lfs:lfs /home/lfs/.bashrc
exit $?