zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Using TRACKING_DIR for CUSTOM_TOOLS.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-10-16 18:17:01 +00:00
parent 93d32cfafb
commit 53f291f65c
3 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Config.in
View file

@ -267,6 +267,17 @@ menu "--- BOOK Settings"
default "uclibc" if LIB_UCLIBC
#--- End HLFS specific params
#--- Custom Tools support
config CUSTOM_TOOLS
bool "Add custom tool support"
default n
depends on BOOK_LFS
help
#--- Activating this option additional packages you create
# will be installed.
#
#--- End Custom Tools support
#--- blfs-tool Support
config BLFS_TOOL
bool "Add blfs-tool support"
@ -389,28 +400,23 @@ menu "--- BOOK Settings"
config TRACKING_DIR
string "Installed packages database directory"
default "/var/lib/jhalfs/BLFS"
depends on BOOK_BLFS || BLFS_TOOL
depends on BOOK_BLFS || BLFS_TOOL || CUSTOM_TOOLS
help
#-- Full path to the directory where the installed
# packages database will be created.
#
# You MUST to create manually this directory.
# If you are installing blfs-tool on a running xLFS system
# you MUST to create manually this directory.
#
# If you are installing blfs-tool as part of a xLFS build
# and/or using the customized scripts feature, you will
# need to fix that directory permissions after booting
# the new system.
#
# Note that the user that will build the packages must
# have read and write privileges on that directory.
#--- End BLFS specific params
#--- Custom Tools support
config CUSTOM_TOOLS
bool "Add custom tool support"
default n
depends on BOOK_LFS
help
#--- Activating this option additional packages you create
# will be installed.
#
#--- End Custom Tools support
#--- End BOOK Settings
endmenu

4
common/custom_pkgs
View file

@ -20,7 +20,7 @@ add_CustomTools() { # Add any users supplied scripts
mk_CUSTOM_TOOLS:
@\$(call echo_CHROOT_request)
@ sudo mkdir -p /home/georgeb/TRIAL/var/lib/jhalfs/BLFS
@ sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}
@( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS")
@touch \$@
@ -48,7 +48,7 @@ ${THIS_SCRIPT}: ${PREV_SCRIPT}
@( time { source envars && /\$(SCRIPT_ROOT)/custom-commands/scripts/${THIS_SCRIPT} >>logs/${THIS_SCRIPT} 2>&1 ; } ) 2>>logs/${THIS_SCRIPT}
@\$(call remove_build_dirs2,${PKG})
@touch \$@
@touch /var/lib/jhalfs/BLFS/${PKG}-${PKG_VERSION}
@touch ${TRACKING_DIR}/${PKG}-${PKG_VERSION}
@\$(call housekeeping)
EOF
) >> ${MKFILE}.tmp2

7
common/func_validate_configs.sh
View file

@ -27,6 +27,7 @@ inline_doc
local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
local -r blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_UNZIP DEP_DBXML DEP_DBXSL DEP_LINKS DEP_SUDO DEP_WGET DEP_SVN DEP_GPM"
local -r custom_tool_PARAM_LIST="TRACKING_DIR"
local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
local -r ERROR_MSG_pt2='rerun make and fix your configuration settings${OFF}'
@ -190,6 +191,12 @@ inline_doc
done
fi
if [[ "${CUSTOM_TOOLS}" = "y" ]] && [[ "${BLFS_TOOL}" = "n" ]] ; then
for config_param in ${custom_tool_PARAM_LIST}; do
echo -e "`eval echo $PARAM_VALS`"
done
fi
set -e
echo "${nl_}***${BOLD}${GREEN} ${PARAM_GROUP%%_*T} config parameters look good${OFF} ***${nl_}"
}