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

Fixed an oditie with x-window-system (I think).

Browse source 
Test if DEP has been already installed after packages remaping.
This commit is contained in:
Manuel Canales Esparcia 2006-08-23 18:45:03 +00:00
parent aea74cb4fc
commit 9b95f2a750
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
BLFS/libs/func_dependencies
View file

@ -177,12 +177,8 @@ 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)
inst_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f4)
[ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
# Special packages (a lot of hacks) # Special packages that need be remaped
case $DEP in case $DEP in
db ) continue ;; # The proper version of DB is installed in LFS db ) continue ;; # The proper version of DB is installed in LFS
@ -196,13 +192,27 @@ inline_doc
kde ) DEP=kde-core ;; kde ) DEP=kde-core ;;
# Set values for alternative packages # Set values for alternative packages
# X is a meta-package, thus handled in another way.
LPRng | cups ) DEP=$PRINT_SERVER ;; LPRng | cups ) DEP=$PRINT_SERVER ;;
mitkrb | heimdal ) DEP=$KBR5 ;; mitkrb | heimdal ) DEP=$KBR5 ;;
gs | espgs ) DEP=$GHOSTSCRIPT ;; gs | espgs ) DEP=$GHOSTSCRIPT ;;
server-mail ) DEP=$MAIL_SERVER ;; server-mail ) DEP=$MAIL_SERVER ;;
x-window-system )
case $X11 in
xorg7 ) DEP=xorg7 ;;
* )
pkg_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f3)
inst_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f4)
[ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
;;
esac
;;
esac esac
# If DEP has been previouly installed, skip it
pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
inst_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f4)
[ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
#------------------ #------------------
# Prevent circular dependencies # Prevent circular dependencies
# If all dependencies are circular, the creation of the *.dep file # If all dependencies are circular, the creation of the *.dep file
@ -272,12 +282,11 @@ inline_doc
kde-core ) kde-core )
cp ../libs/kde-core.dep dependencies/ cp ../libs/kde-core.dep dependencies/
;; ;;
x-window-system ) # X11 alternatives x-window-system ) # When X11 is not Xorg7
echo -e "x-config\nx-setup\n$X11" > dependencies/x-window-system.dep echo -e "x-config\nx-setup\n$X11" > dependencies/x-window-system.dep
;; ;;
xorg7 ) # At dependencies level, remove x-config and x-setup xorg7 )
cp ../libs/xorg7.dep dependencies/ cp ../libs/xorg7.dep dependencies/
sed -i '/x-config/d;/x-setup/d' dependencies/xorg7.dep
;; ;;
* ) xsltproc --stringparam dependencies $DEP_LV \ * ) xsltproc --stringparam dependencies $DEP_LV \
-o dependencies/$DEP.dep ../libs/dependencies.xsl ../$DEP_XML -o dependencies/$DEP.dep ../libs/dependencies.xsl ../$DEP_XML