r2945 - in jhalfs/trunk: . BLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Aug 14 11:33:06 PDT 2006


Author: manuel
Date: 2006-08-14 12:33:05 -0600 (Mon, 14 Aug 2006)
New Revision: 2945

Added:
   jhalfs/trunk/BLFS/envars.conf
Removed:
   jhalfs/trunk/BLFS/makefile.conf
Modified:
   jhalfs/trunk/BLFS/gen-makefile.sh
   jhalfs/trunk/README.BLFS
Log:
Renamed makefile.conf to envars.conf

Copied: jhalfs/trunk/BLFS/envars.conf (from rev 2942, jhalfs/trunk/BLFS/makefile.conf)
===================================================================
--- jhalfs/trunk/BLFS/envars.conf	                        (rev 0)
+++ jhalfs/trunk/BLFS/envars.conf	2006-08-14 18:33:05 UTC (rev 2945)
@@ -0,0 +1,22 @@
+#####
+#
+# Configuration file for the BLFS module
+#
+# $Id$
+#
+# Set default SRC_ARCHIVE and FTP_DIR
+#
+#####
+
+
+#--- The local repository for packages/file
+#    Any missing file will be downloaded and archived here,
+#    if the user has the right priviledges.
+export SRC_ARCHIVE=$SRC_ARCHIVE
+
+# --- Server used if the file isn't found in SRC_ARCHIVE.
+# As a last resort, the file will dowloaded from upstream, if possible.
+#
+# The server path MUST be set as listed in
+# http://www.linuxfromscratch.org/blfs/download.html
+export FTP_SERVER=ftp://anduin.linuxfromscratch.org/BLFS/

Modified: jhalfs/trunk/BLFS/gen-makefile.sh
===================================================================
--- jhalfs/trunk/BLFS/gen-makefile.sh	2006-08-14 17:12:43 UTC (rev 2944)
+++ jhalfs/trunk/BLFS/gen-makefile.sh	2006-08-14 18:33:05 UTC (rev 2945)
@@ -40,7 +40,7 @@
 #----------------------------------#
 (
 cat << EOF
-	@source ../makefile.conf && ${BUILD_SCRIPTS}/\$@ >logs/\$@ 2>&1
+	@source ../envars.conf && ${BUILD_SCRIPTS}/\$@ >logs/\$@ 2>&1
 EOF
 ) >> $MKFILE.tmp
 }

Deleted: jhalfs/trunk/BLFS/makefile.conf
===================================================================
--- jhalfs/trunk/BLFS/makefile.conf	2006-08-14 17:12:43 UTC (rev 2944)
+++ jhalfs/trunk/BLFS/makefile.conf	2006-08-14 18:33:05 UTC (rev 2945)
@@ -1,22 +0,0 @@
-#####
-#
-# Configuration file for the BLFS module
-#
-# $Id$
-#
-# Set default SRC_ARCHIVE and FTP_DIR
-#
-#####
-
-
-#--- The local repository for packages/file
-#    Any missing file will be downloaded and archived here,
-#    if the user has the right priviledges.
-export SRC_ARCHIVE=$SRC_ARCHIVE
-
-# --- Server used if the file isn't found in SRC_ARCHIVE.
-# As a last resort, the file will dowloaded from upstream, if possible.
-#
-# The server path MUST be set as listed in
-# http://www.linuxfromscratch.org/blfs/download.html
-export FTP_SERVER=ftp://anduin.linuxfromscratch.org/BLFS/

Modified: jhalfs/trunk/README.BLFS
===================================================================
--- jhalfs/trunk/README.BLFS	2006-08-14 17:12:43 UTC (rev 2944)
+++ jhalfs/trunk/README.BLFS	2006-08-14 18:33:05 UTC (rev 2945)
@@ -37,7 +37,7 @@
     TODO               developers notes
     packages           auto-generated file with packages info
     alternatives.conf  configuration files for alternative packages
-    makefile.conf      envars needed when running the generated Makefile
+    envars.conf        envars needed when running the build scripts
     update_book.sh     update the XML book sources and regenerate packages file
                        and GNOME and KDE dependencies tree
     blfs-parser.sh     generates linear BLFS books and build scripts




More information about the alfs-log mailing list