Changeset dd8be9e

Timestamp:

08/18/2014 10:48:37 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

29b3453

Parents:

d312fbb3

Message:

Merge one forgotten commit.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13944 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• postlfs/config/profile-systemd.xml (modified) (6 diffs)
• x/installing/xorg7.xml (modified) (1 diff)

postlfs/config/profile-systemd.xml

@@ -162 +162 @@
 done
 
+uset script RED GREEN NORMAL
+
 # End /etc/profile</literal>
 EOF</userinput></screen>
@@ -214 +216 @@
       </indexterm>
 
-      <para>This script adds several useful paths to the <envar>PATH</envar> and
-      <envar>PKG_CONFIG_PATH</envar> environment variables.  If you want, you
-      can uncomment the last section to put a dot at the end of your path. This will
-      allow executables in the current working directory to be executed without
-      specifying a ./, however you are warned that this is generally considered a
-      security hazard.</para>
+      <para>This script adds some useful paths to the <envar>PATH</envar> and
+      can be used to customize other PATH related environment variables
+      (e.g. LD_LIBRARY_PATH, etc) that may be needed for all users.</para> 
 
 <screen role="root"><userinput>cat &gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
@@ -230 +229 @@
 if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
         pathprepend /usr/local/sbin
-fi
-
-if [ -d ~/bin ]; then
-        pathprepend ~/bin
-fi
-#if [ $EUID -gt 99 ]; then
-#        pathappend .
-#fi</literal>
+fi</literal>
 EOF</userinput></screen>
 
@@ -402 +394 @@
 fi
 
+unset RED GREEN NORMAL
+
 # End /etc/bashrc</literal>
 EOF</userinput></screen>
@@ -434 +428 @@
 # System wide aliases and functions are in /etc/bashrc.
 
-append () {
-  # First remove the directory
-  local IFS=':'
-  local NEWPATH
-  for DIR in $PATH; do
-     if [ "$DIR" != "$1" ]; then
-       NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
-     fi
-  done
-
-  # Then append the directory
-  export PATH=$NEWPATH:$1
-}
-
 if [ -f "$HOME/.bashrc" ] ; then
   source $HOME/.bashrc
@@ -453 +433 @@
 
 if [ -d "$HOME/bin" ] ; then
-  append $HOME/bin
-fi
-
-unset append
+  pathprepend $HOME/bin
+fi
+
+# Having . in the PATH is dangerous
+#if [ $EUID -gt 99 ]; then
+#  pathappend .
+#fi
 
 # End ~/.bash_profile</literal>

x/installing/xorg7.xml

@@ -79 +79 @@
   user that will be building the xorg packages.</para>
 
-  <!--
-  <para>The commands below
-  (or similar) can be entered at the command line to compile each
-  section (proto, util, lib, app, driver).  The wiki links on each
-  section's page contain specific commands to compile the entire group of
-  packages, based on the content of the wget files.</para>
-
-<screen>bash -e #exit on all errors
-section=<replaceable>&lt;proto&gt;</replaceable>
-version=&xorg-version;
-mkdir $section
-cd $section
-
-# download and check packages
-grep -v '^#' ../${section}-${version}.wget | wget -i- -c \
-    -B http://xorg.freedesktop.org/releases/individual/${section}/
-md5sum -c ../${section}-${version}.md5
-
-# build packages
-for package in $(grep -v '^#' ../${section}-${version}.wget)
-do
-  packagedir=$(echo $package | sed 's/.tar.bz2//')
-  tar -xf $package
-  cd $packagedir
-  ./configure $XORG_CONFIG
-  make
-  make install
-  cd ..
-  rm -rf $packagedir
-done 2&gt;&amp;1 | tee -a ../xorg-${section}-compile.log #log the entire loop</screen>
-
-  <para>The above shell will exit immediately on error.  If it runs to
-  completion, you should manually exit the shell before continuing on to
-  the next set of instructions.</para>
--->
-
   <sect2 id="xorg-env" xreflabel="Xorg build environment">
     <title>Setting up the Xorg Build Environment</title>
+
+    <note><para>The following instructions assume that the shell
+    startup files have been set up as described in 
+    <xref linkend="postlfs-config-profile" />.
+    </para></note>
 
     <para>First, you'll need to create a working directory:</para>