diff --git a/CLFS/config b/CLFS/config index a25aa2d..92e0123 100644 --- a/CLFS/config +++ b/CLFS/config @@ -37,7 +37,7 @@ TARGET= #--- Create a minimal boot system 0(chroot)/1(bootmin) # NOTE: not all combinations are 'bootable' yet. -BOOTMINIMAL=1 +BOOTMINIMAL=0 #--- Location of fstab file (if empty, a template is created) FSTAB= diff --git a/common/common-functions b/common/common-functions index a95b1db..5fcee0d 100644 --- a/common/common-functions +++ b/common/common-functions @@ -679,12 +679,14 @@ extract_commands() { # # Build a file with only arch specific files.. small ugly.. LOC_add_packages_entry() { local fileMATCH aFILE - + fileMATCH="/$1" # format.. Filename-Version or FilenameVersion for aFILE in `grep ${fileMATCH}-*[[:digit:]] packageslist_.wget`; do - # The aFILE%\?* is necessary to strip the "?download" appended to sourceforge files - echo "$1-version \"$2\"" >> packages + # Block vim-x.x-lang file, will add it later based on config flag + if [[ ! "${aFILE}" =~ "vim-$2-lang" ]]; then + echo "$1-version \"$2\"" >> packages + fi done } ################################# diff --git a/master.sh b/master.sh index c01d5e7..9c0f96d 100755 --- a/master.sh +++ b/master.sh @@ -334,5 +334,5 @@ echo "---------------${nl_}" build_Makefile echo "---------------${nl_}" -#run_make +run_make