Making TRACKING_DIR a configurable value.

This commit is contained in:
Manuel Canales Esparcia 2006-08-21 20:03:19 +00:00
parent 5f14bd3124
commit 2d0a2e55bd
5 changed files with 25 additions and 5 deletions

View file

@ -4,12 +4,14 @@
# #
set -e set -e
# Uncomment this when reasy to be used
#source ../configuration
# TEMPORARY VARIABLES.. development use only # TEMPORARY VARIABLES.. development use only
declare MKFILE=Makefile declare MKFILE=Makefile
declare PREV_PACKAGE="" declare PREV_PACKAGE=""
declare BUILD_SCRIPTS=scripts declare BUILD_SCRIPTS=scripts
# Remove this when we can use configuration
declare TRACKING_DIR=/var/lib/jhalfs/BLFS declare TRACKING_DIR=/var/lib/jhalfs/BLFS
HEADER="# This file is automatically generated by jhalfs HEADER="# This file is automatically generated by jhalfs

View file

@ -6,7 +6,7 @@
export outFile=aConfig.in # file for reading and writing to. export outFile=aConfig.in # file for reading and writing to.
export inFile=packages # 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_NAME
declare PKG_XML_FILE declare PKG_XML_FILE
@ -236,6 +236,10 @@ config SUDO
Select if sudo will be used (you want build as a normal user) Select if sudo will be used (you want build as a normal user)
otherwise sudo is not needed (you want build as root) otherwise sudo is not needed (you want build as root)
config TRACKING_DIR
string
default $TRACKING_DIR
EOF EOF
) >> $outFile ) >> $outFile
echo "done" echo "done"

View file

@ -136,6 +136,7 @@ do_dependencies() { # Loop to find sub-dependencies :::WARNING::: THIS IS
$KBR5 $KBR5
$GHOSTSCRIPT $GHOSTSCRIPT
$MAILSERVER $MAILSERVER
$TRACKING_DIR
file: depure.txt file: depure.txt
$TARGET-index.xml.tmp $TARGET-index.xml.tmp
$PKG.dep $PKG.dep
@ -154,6 +155,7 @@ inline_doc
local saveIFS=$IFS local saveIFS=$IFS
local DEP_LV=$DEP_LEVEL local DEP_LV=$DEP_LEVEL
local line line2 DEP pkg_ver local line line2 DEP pkg_ver
# Remove this when we can use configuration file
local TRACKING_DIR=/var/lib/jhalfs/BLFS local TRACKING_DIR=/var/lib/jhalfs/BLFS
#------------------ #------------------

View file

@ -294,6 +294,17 @@ menu "--- BOOK Settings"
help help
#-- The directory name where BLFS book sources #-- The directory name where BLFS book sources
# will be checkout. # 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 BLFS specific params
#--- End BOOK Settings #--- End BOOK Settings

7
blfs
View file

@ -124,9 +124,10 @@ rm -rf menu/.svn
rm -rf menu/lxdialog/.svn rm -rf menu/lxdialog/.svn
# Fix BLFS_XML harcoded values # Set some harcoded values to the proper values
sed -i 's,blfs-xml,'$BLFS_XML',' update_book.sh 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,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 # Fetch book sources and create packages and GNOME/KDE dependencies files
if [[ -d $BLFS_XML ]] ; then if [[ -d $BLFS_XML ]] ; then