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

CLFS, manipulation of BOOT_CONFIG in CLFS/master.sh and common/func_validate_configs.sh

Browse source
This commit is contained in:
George Boudreau 2006-03-21 23:25:40 +00:00
parent 68809ca3f8
commit 6eef5ef3fe
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CLFS/master.sh
View file

@ -219,8 +219,8 @@ boot_Makefiles() { #
*kernel) # if there is no kernel config file do not build the kernel *kernel) # if there is no kernel config file do not build the kernel
[[ -z $CONFIG ]] && continue [[ -z $CONFIG ]] && continue
# Copy the config file to /sources with a standardized name # Copy the config file to /sources with a standardized name
cp $CONFIG $BUILDDIR/sources/kernel-config cp $BOOT_CONFIG $BUILDDIR/sources/bootkernel-config
sed "s|make mrproper|make mrproper\ncp /sources/kernel-config .config|" -i $file sed "s|make mrproper|make mrproper\ncp /sources/bootkernel-config .config|" -i $file
# You cannot run menuconfig from within the makefile # You cannot run menuconfig from within the makefile
sed 's|menuconfig|oldconfig|' -i $file sed 's|menuconfig|oldconfig|' -i $file
#If defined include the keymap in the kernel #If defined include the keymap in the kernel

16
common/func_validate_configs.sh
View file

@ -116,7 +116,7 @@ inline_doc
fi fi
for config_param in FSTAB CONFIG BOOK; do for config_param in FSTAB BOOK CONFIG; do
[[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`" [[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`"
if [[ $config_param = BOOK ]]; then if [[ $config_param = BOOK ]]; then
[[ ! "${WC}" = 1 ]] && continue [[ ! "${WC}" = 1 ]] && continue
@ -127,8 +127,20 @@ inline_doc
# If you make it this far then there is a problem # If you make it this far then there is a problem
write_error_and_die write_error_and_die
done done
echo " ${BOLD}${GREEN}${PARAM_GROUP%%_*T} specific parameters are valid${OFF}"
[[ "$PROGNAME" = "clfs" ]] &&
for config_param in BOOT_CONFIG; do
if [[ "${METHOD}" = "boot" ]]; then
[[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`"
# There must be a config file when the build method is 'boot'
[[ -e "${!config_param}" ]] && [[ -s "${!config_param}" ]] && continue
# If you make it this far then there is a problem
write_error_and_die
fi
done
echo " ${BOLD}${GREEN}${PARAM_GROUP%%_*T} specific parameters are valid${OFF}"
done done
set -e set -e
echo "$tab_***${BOLD}${GREEN}Config parameters look good${OFF}***" echo "$tab_***${BOLD}${GREEN}Config parameters look good${OFF}***"
} }