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

Skip installed packages when processing dependencies instead of when generating the Makefile.

Browse source 
Fixed a bug when TARGET=xorg7
This commit is contained in:
Manuel Canales Esparcia 2006-08-21 18:42:52 +00:00
parent 86f740c46c
commit 5f14bd3124
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BLFS/gen-makefile.sh
View file

@ -112,11 +112,9 @@ generate_Makefile () { #
for package_script in scripts/* ; do for package_script in scripts/* ; do
this_script=`basename $package_script` this_script=`basename $package_script`
pkg_ver=$(grep "^${this_script#*-?-}[[:space:]]" ../packages | cut -f3) pkg_ver=$(grep "^${this_script#*-?-}[[:space:]]" ../packages | cut -f3)
if [ ! -e $TRACKING_DIR/${this_script#*-?-}-$script_ver ]; then
pkg_list="$pkg_list ${this_script}" pkg_list="$pkg_list ${this_script}"
__write_entry "${this_script}" "${pkg_ver}" __write_entry "${this_script}" "${pkg_ver}"
PREV_PACKAGE=${this_script} PREV_PACKAGE=${this_script}
fi
done done

10
BLFS/libs/func_dependencies
View file

@ -46,8 +46,6 @@ inline_doc
#--------------------- #---------------------
# The BLFS sources directory. # The BLFS sources directory.
# Note: for book.xsl this value must be set via a sed in ./blfs.
# For consistency, we should to do the same here.
BLFS_XML=`echo $PKGXML | sed -e 's,/.*,,'` BLFS_XML=`echo $PKGXML | sed -e 's,/.*,,'`
if [[ ! -d ../$BLFS_XML ]] ; then if [[ ! -d ../$BLFS_XML ]] ; then
@ -109,7 +107,7 @@ inline_doc
# Write the XInclude # Write the XInclude
case $TARGET in case $TARGET in
# If there is no usefull XML page, skip it. # If there is no usefull XML page, skip it.
alsa | gnome-core | gnome-full | kde-core | kde-full | kde-koffice ) ;; alsa | gnome-core | gnome-full | kde-core | kde-full | kde-koffice | xorg7) ;;
* ) * )
echo -e " $ENTRY_START$PKGXML$ENTRY_END" >> $TARGET-index.xml.tmp echo -e " $ENTRY_START$PKGXML$ENTRY_END" >> $TARGET-index.xml.tmp
;; ;;
@ -155,7 +153,8 @@ inline_doc
local PKG=$1 local PKG=$1
local saveIFS=$IFS local saveIFS=$IFS
local DEP_LV=$DEP_LEVEL local DEP_LV=$DEP_LEVEL
local line line2 DEP local line line2 DEP pkg_ver
local TRACKING_DIR=/var/lib/jhalfs/BLFS
#------------------ #------------------
# If a premade xinclude file exists, use it. If not, create one # If a premade xinclude file exists, use it. If not, create one
@ -179,6 +178,9 @@ inline_doc
# Start with a clean $PKG.xinc.tmp file # Start with a clean $PKG.xinc.tmp file
> xincludes/$PKG.xinc.tmp > xincludes/$PKG.xinc.tmp
for DEP in `cat dependencies/$PKG.dep`; do for DEP in `cat dependencies/$PKG.dep`; do
# If DEP has been previouly installed, skip it
pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
[ -e $TRACKING_DIR/${DEP}-$pkg_ver ] && continue
# Special packages (a lot of hacks) # Special packages (a lot of hacks)
case $DEP in case $DEP in