r3027 - in jhalfs/branches/experimental: . BLFS BLFS/libs

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Aug 21 13:03:23 PDT 2006


Author: manuel
Date: 2006-08-21 14:03:19 -0600 (Mon, 21 Aug 2006)
New Revision: 3027

Modified:
   jhalfs/branches/experimental/BLFS/gen-makefile.sh
   jhalfs/branches/experimental/BLFS/gen_config.sh
   jhalfs/branches/experimental/BLFS/libs/func_dependencies
   jhalfs/branches/experimental/Config.in
   jhalfs/branches/experimental/blfs
Log:
Making TRACKING_DIR a configurable value.

Modified: jhalfs/branches/experimental/BLFS/gen-makefile.sh
===================================================================
--- jhalfs/branches/experimental/BLFS/gen-makefile.sh	2006-08-21 18:42:52 UTC (rev 3026)
+++ jhalfs/branches/experimental/BLFS/gen-makefile.sh	2006-08-21 20:03:19 UTC (rev 3027)
@@ -4,12 +4,14 @@
 #
 set -e
 
+# Uncomment this when reasy to be used
+#source ../configuration
 
-
 # TEMPORARY VARIABLES.. development use only
 declare MKFILE=Makefile
 declare PREV_PACKAGE=""
 declare BUILD_SCRIPTS=scripts
+# Remove this when we can use configuration
 declare TRACKING_DIR=/var/lib/jhalfs/BLFS
 
 HEADER="# This file is automatically generated by jhalfs

Modified: jhalfs/branches/experimental/BLFS/gen_config.sh
===================================================================
--- jhalfs/branches/experimental/BLFS/gen_config.sh	2006-08-21 18:42:52 UTC (rev 3026)
+++ jhalfs/branches/experimental/BLFS/gen_config.sh	2006-08-21 20:03:19 UTC (rev 3027)
@@ -6,7 +6,7 @@
 export outFile=aConfig.in	# file for reading and writing to.
 export inFile=packages		# file for reading and writing to.
 
-declare TRACKING_DIR=/var/lib/jhalfs/BLFS
+declare TRACKING_DIR=tracking-dir
 
 declare PKG_NAME
 declare PKG_XML_FILE
@@ -236,6 +236,10 @@
 		Select if sudo will be used (you want build as a normal user)
 		        otherwise sudo is not needed (you want build as root)
 
+config	TRACKING_DIR
+	string
+	default	$TRACKING_DIR
+
 EOF
 ) >> $outFile
 echo "done"

Modified: jhalfs/branches/experimental/BLFS/libs/func_dependencies
===================================================================
--- jhalfs/branches/experimental/BLFS/libs/func_dependencies	2006-08-21 18:42:52 UTC (rev 3026)
+++ jhalfs/branches/experimental/BLFS/libs/func_dependencies	2006-08-21 20:03:19 UTC (rev 3027)
@@ -136,6 +136,7 @@
                        $KBR5
                        $GHOSTSCRIPT
                        $MAILSERVER
+                       $TRACKING_DIR
                 file:  depure.txt
                        $TARGET-index.xml.tmp
                        $PKG.dep
@@ -154,6 +155,7 @@
   local saveIFS=$IFS
   local DEP_LV=$DEP_LEVEL
   local line line2 DEP pkg_ver
+  # Remove this when we can use configuration file
   local TRACKING_DIR=/var/lib/jhalfs/BLFS
 
   #------------------

Modified: jhalfs/branches/experimental/Config.in
===================================================================
--- jhalfs/branches/experimental/Config.in	2006-08-21 18:42:52 UTC (rev 3026)
+++ jhalfs/branches/experimental/Config.in	2006-08-21 20:03:19 UTC (rev 3027)
@@ -294,6 +294,17 @@
 		help
 			#-- The directory name where BLFS book sources
 			#   will be checkout.
+
+	config	TRACKING_DIR
+		string "Installed packages database directory"
+		default "/var/lib/jhalfs/BLFS"
+		depends on BOOK_BLFS
+		help
+			#-- Full path to the directory where the installed
+			#   packages database will be created.
+			#
+			#   Note that the user that will build the packages must
+			#   have read and write privileges on that directory.
 	#--- End BLFS specific params
 
 #--- End BOOK Settings

Modified: jhalfs/branches/experimental/blfs
===================================================================
--- jhalfs/branches/experimental/blfs	2006-08-21 18:42:52 UTC (rev 3026)
+++ jhalfs/branches/experimental/blfs	2006-08-21 20:03:19 UTC (rev 3027)
@@ -124,9 +124,10 @@
 rm -rf menu/lxdialog/.svn
 
 
-# Fix BLFS_XML harcoded values
-sed -i 's,blfs-xml,'$BLFS_XML',' update_book.sh
-sed -i 's,blfs-xml,'$BLFS_XML',' libs/book.xsl
+# Set some harcoded values to the proper values
+sed -i 's,blfs-xml,'$BLFS_XML',' update_book.sh libs/book.xsl
+#sed -i 's,blfs-xml,'$BLFS_XML',' libs/book.xsl
+sed -i 's,tracking-dir,'$TRACKING_DIR',' gen_config.sh
 
 # Fetch book sources and create packages and GNOME/KDE dependencies files
 if [[ -d $BLFS_XML ]] ; then




More information about the alfs-log mailing list