Author: pierre
Date: Mon Feb 27 05:57:52 2017
New Revision: 3884

Log:
Adapt BLFS/envars.conf to modern BLFS books

Modified:
   jhalfs/branches/new_features/BLFS/envars.conf

Modified: jhalfs/branches/new_features/BLFS/envars.conf
==============================================================================
--- jhalfs/branches/new_features/BLFS/envars.conf       Mon Feb 27 05:55:30 
2017        (r3883)
+++ jhalfs/branches/new_features/BLFS/envars.conf       Mon Feb 27 05:57:52 
2017        (r3884)
@@ -10,121 +10,39 @@
 
 #======== Common envars ==========
 
-#--- Set a well-known working locale when building software
-export LC_ALL=C
+#--- The sources directory.
+#    This directory contains sub directories (one for each package), where
+#    packages are stored, unpacked, and compiled.
+export SRC_DIR=/sources
 
 #--- The local repository for packages/file
 #    Any missing file will be downloaded and archived here,
-#    if the user has the right priviledges.
+#    if the user has the right priviledges. Can be the same as SRC_DIR
 export SRC_ARCHIVE=/sources
 
-#--- Server used if the file isn't found in SRC_ARCHIVE.
-# As a last resort, the file will dowloaded from upstream, if possible.
+#--- Set a well-known working locale when building software
+# Note that an UTF-8 locale may be needed for some packages,
+# but normally it is set in the package instructions.
+# Furthermore, LANG may be set in /etc/profile, which is
+# sourced at the end of this file.
+export LC_ALL=C
+
+#--- Server used if the file isn't found in SRC_ARCHIVE or SRC_DIR,
+# and cannot be downloaded from upstream.
 #
 # The server path MUST be set as listed in
-# http://www.linuxfromscratch.org/blfs/download.html
-export FTP_SERVER=ftp://anduin.linuxfromscratch.org/BLFS/
+# http://www.linuxfromscratch.org/blfs/download.html.
+# Note that despite the name of the variable, it can be an http url.
+export FTP_SERVER=http://ftp.osuosl.org/pub/blfs/
 
+### Currently not used in scripts ###
 # Use a server close to you for Xorg (see http://wiki.x.org/wiki/Mirrors)
-export FTP_X_SERVER=ftp://mirror.cict.fr/x.org/
-
-#--- The sources directory.
-#    Full path to the top level directory where packages will be stored,
-#    unpacked, and compiled.
-export SRC_DIR=/sources
-
-
-#======== Xorg7 envars ===========
-
-#--- Installation prefix
-export XORG_PREFIX=/usr
-
-#--- Configure switches
-export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc \
-    --localstatedir=/var --disable-static"
-
-#======== ABOUT GNOME envars =====
-
-# Refer to `Chapter 30. Right now, the book hard codes --prefix=/usr
-# and does not make use of the variables below. If you need another prefix,
-# You'll have to modifiy the prefix in the book source and use the variables
-# below. But this is not supported in this tool.
-
-#======== LEGACY GNOME envars ====
-
-# We use envars.conf instead of /etc/profile.d. But if you
-# install into a different prefix, you'll need to update ld.so.conf and
-# man-db.conf, too.
-
-#--- Installation prefix
-# export GNOME_PREFIX=/usr
-# export GNOME_SYSCONFDIR=/etc/gnome/3.2.2
-# export XDG_CONFIG_DIRS=$GNOME_SYSCONFDIR/xdg
-# export XDG_DATA_DIRS=/usr/share:/usr/local/share
-
-#--- If you want to install GNOME on a non standard prefix, uncomment
-#    the next export lines and edit it if needed.
-#    See also the GNOME Pre-installation Configuration HTML page for
-#    aditional required commands.
-#export PATH=$PATH:$GNOME_PREFIX/bin
-#export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$GNOME_PREFIX/lib/pkgconfig
-#export GNOME_LIBCONFIG_PATH=/usr/lib:$GNOME_PREFIX/lib
-
-#======== KDE envars =============
-
-# Refer to `Chapter 27. Introduction->KDE Pre-installation Configuration'
-# for rationale. We use envars.conf instead of /etc/profile.d. But if you
-# install into a different prefix, you'll need to update ld.so.conf and
-# man-db.conf, and to create and populate the directories $KDE_PREFIX/share
-# and /etc/dbus-1, as instructed.
-
-#--- Installation prefix
-export KDE_PREFIX=/usr
-
-#--- If you want to install KDE on a non standard prefix, uncomment
-#    the next lines and edit them as needed.
-#export KDE_PREFIX=/opt/kde
-#export KDEDIR=$KDE_PREFIX
-
-#PATH=$PATH:$KDE_PREFIX/bin
-#if [ -z PKG_CONFIG_PATH ]; then
-#export   PKG_CONFIG_PATH=$KDE_PREFIX/lib/pkgconfig:$KDE_PREFIX/share/pkgconfig
-#else
-#  
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDE_PREFIX/lib/pkgconfig:$KDE_PREFIX/share/pkgconfig
-#fi
-# Note: there is a report that setting XDG_... vars for kde may break LXDE
-#if [ -z XDG_DATA_DIRS ]; then
-#export   XDG_DATA_DIRS=$KDE_PREFIX/share
-#else
-#  XDG_DATA_DIRS=$XDG_DATA_DIRS:$KDE_PREFIX/share
-#fi
-#if [ -z XDG_CONFIG_DIRS ]; then
-#export   XDG_CONFIG_DIRS=/etc/kde/xdg
-#else
-#  XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
-#fi
-
-#======== LXQt envars =============
-
-# Refer to `Chapter 40. LXQt Desktop Pre-Install Instructions'
-# We use envars.conf for LXQT_PREFIX, instead of /etc/profile.d. But if you
-# install into a different prefix, you'll need to create the relevant
-# directory, to create /etc/profiles.d/lxqt.sh, update /etc/ld.so.conf, and
-# to create and populate the directories $LXQT_PREFIX/share/icons, as
-# instructed.
-
-#--- Installation prefix
-export LXQT_PREFIX=/usr
-
-#--- If you want to install LXQT on a non standard prefix, uncomment
-#    the next line and edit it as needed, or just use the book's
-#    /etc/profile.d/lxqt.sh.
-# export LXQT_PREFIX=/opt/lxqt
+# export FTP_X_SERVER=ftp://mirror.cict.fr/x.org/
 
 #======== Optimizations =============
 
 # Global optimization settings can be placed here. This settings can be
-# overrided by settings in the packages build scripts.
+# overriden by settings in the packages build scripts.
 
 # WARNING: The use of build optimizations may be dangerous.
 #   You should know what you are doing and be sure that the
@@ -145,9 +63,11 @@
 
 #======== Environment settings ========
 
-# Since the startup files may be changed in the course
-# of a build, ensure that environment variables are
-# up to date
+# The prefered way to setup environment variables nowadays
+# is to set them in /etc/profile{,.d/*.sh}.
+# It is recommended to source /etc/profile in this file
+# since a package may add some new variables in there,
+# which may be needed later in dependant packages.
 
 if [ -r /etc/profile ]; then source /etc/profile; fi
 
@@ -156,10 +76,10 @@
 # We need the functions in "packInstall.sh" when installing a package,
 # if package management is requested. Note that we have no way to know
 # whether package management is requested for a given build.
-# Furthermore, "sudo -E" exports varaubales, but not functions from
+# Furthermore, "sudo -E" exports variables, but not functions from
 # the environment, and sudo needs to be called before porg, due
 # to porg limitations. So we just export the location of the file
-# where the functions are dfined, and we'll source it just before
+# where the functions are defined, and we'll source it just before
 # installing.
 
 export PACK_INSTALL=/blfs_root/packInstall.sh # change as needed
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

Reply via email to