More circular dependencies fixes.
This commit is contained in:
parent
2ca2992447
commit
f1fadebc71
1 changed files with 23 additions and 28 deletions
|
@ -65,6 +65,8 @@ inline_doc
|
||||||
#---------------------
|
#---------------------
|
||||||
# Create target package dependencies list
|
# Create target package dependencies list
|
||||||
case $TARGET in
|
case $TARGET in
|
||||||
|
# Skip the creation when all dependencies are circular.
|
||||||
|
alsa-lib | cracklib | libexif | unixodbc ) ;;
|
||||||
# Meta-packages at target level
|
# Meta-packages at target level
|
||||||
# KDE and Gnome-{core,full} could be made via packages.sh, but not sure yet how.
|
# KDE and Gnome-{core,full} could be made via packages.sh, but not sure yet how.
|
||||||
alsa ) # When target "alsa", use all alsa-* packages
|
alsa ) # When target "alsa", use all alsa-* packages
|
||||||
|
@ -91,7 +93,13 @@ inline_doc
|
||||||
|
|
||||||
#---------------------
|
#---------------------
|
||||||
# Write the XInclude
|
# Write the XInclude
|
||||||
echo -e " $ENTRY_START$PKGXML$ENTRY_END" >> $TARGET-index.xml.tmp
|
case $TARGET in
|
||||||
|
# If there is no usefull XML page, skip it.
|
||||||
|
alsa | arts | gnome-core | gnome-full | kde-core | kde-full | kde-koffice ) ;;
|
||||||
|
* )
|
||||||
|
echo -e " $ENTRY_START$PKGXML$ENTRY_END" >> $TARGET-index.xml.tmp
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
#------------------P---
|
#------------------P---
|
||||||
# Start with a clean depure.txt file
|
# Start with a clean depure.txt file
|
||||||
|
@ -175,7 +183,7 @@ inline_doc
|
||||||
perl-* | tk-perl ) DEP=perl-modules ;;
|
perl-* | tk-perl ) DEP=perl-modules ;;
|
||||||
|
|
||||||
# Orphan links (proper link must be created when generating the book)
|
# Orphan links (proper link must be created when generating the book)
|
||||||
arts ) DEP=aRts ;; # That should be fixed in the BLFS book
|
arts ) DEP=aRts ;;
|
||||||
# Set values for alternative packages
|
# Set values for alternative packages
|
||||||
# X is a meta-package, thus handled in another way.
|
# X is a meta-package, thus handled in another way.
|
||||||
LPRng | cups ) DEP=$PRINT_SERVER ;;
|
LPRng | cups ) DEP=$PRINT_SERVER ;;
|
||||||
|
@ -186,12 +194,11 @@ inline_doc
|
||||||
|
|
||||||
#------------------
|
#------------------
|
||||||
echo -e "\tDEP for $PKG is $DEP" >> depure.txt
|
echo -e "\tDEP for $PKG is $DEP" >> depure.txt
|
||||||
# Prevent circular dependencies when level 3
|
# Prevent circular dependencies
|
||||||
|
# If all dependencies are circular, the creation of the *.dep file
|
||||||
|
# must be skipped, not placed here, to avoid that the script will bomb
|
||||||
|
# due empty *.xinc files
|
||||||
case $DEP in
|
case $DEP in
|
||||||
python )
|
|
||||||
# cracklib-->python-->tk-->X-->linux-pam-->cracklib
|
|
||||||
[[ "$PKG" = "cracklib" ]] && continue
|
|
||||||
;;
|
|
||||||
jadetex | perl-* | lynx | Links | w3m )
|
jadetex | perl-* | lynx | Links | w3m )
|
||||||
# Optional dependencies are runtime only
|
# Optional dependencies are runtime only
|
||||||
[[ "$PKG" = "docbook-utils" ]] && continue
|
[[ "$PKG" = "docbook-utils" ]] && continue
|
||||||
|
@ -204,33 +211,22 @@ inline_doc
|
||||||
# cyrus-sasl-->several-->cyrus-sasl
|
# cyrus-sasl-->several-->cyrus-sasl
|
||||||
[[ "$PKG" = "cyrus-sasl" ]] && continue
|
[[ "$PKG" = "cyrus-sasl" ]] && continue
|
||||||
;;
|
;;
|
||||||
doxygen )
|
|
||||||
# alsa-lib-->doxygen-->graphviz-->jdk-->alsa-lib
|
|
||||||
# Commented out due that it bomb "jdk 3" Why??
|
|
||||||
#[[ "$PKG" = "alsa-lib" ]] && continue
|
|
||||||
# libexif-->doxygen-->graphviz-->php-->libexif
|
|
||||||
[[ "$PKG" = "libexif" ]] && continue
|
|
||||||
;;
|
|
||||||
qt )
|
|
||||||
# unixodbc-->qt-->unixodbc
|
|
||||||
[[ "$PKG" = "unixodbc" ]] && continue
|
|
||||||
;;
|
|
||||||
espgs )
|
espgs )
|
||||||
# sendmail-->espgs-->cups-->php-->sendmail
|
# sendmail-->espgs-->cups-->php-->sendmail
|
||||||
[[ "$PKG" = "$MAIL_SERVER" ]] && continue
|
[[ "$PKG" = "$MAIL_SERVER" ]] && continue
|
||||||
;;
|
;;
|
||||||
graphviz )
|
|
||||||
# libexif-->graphviz-->php-->libexif
|
|
||||||
[[ "$PKG" = "libexif" ]] && continue
|
|
||||||
;;
|
|
||||||
aRts )
|
aRts )
|
||||||
# esound-->aRts-->esound
|
# esound-->aRts-->esound
|
||||||
[[ "$PKG" = "esound" ]] && continue
|
[[ "$PKG" = "esound" ]] && continue
|
||||||
;;
|
;;
|
||||||
gimp )
|
gimp | sane )
|
||||||
# imagemagick-->gimp-->imagemagick
|
# imagemagick-->{sane}-->gimp-->imagemagick
|
||||||
[[ "$PKG" = "imagemagick" ]] && continue
|
[[ "$PKG" = "imagemagick" ]] && continue
|
||||||
;;
|
;;
|
||||||
|
ffmpeg )
|
||||||
|
# alsa-plugins-->ffmpeg-->several-->alsa-plugins
|
||||||
|
[[ "$PKG" = "alsa-plugins" ]] && continue
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
#------------------
|
#------------------
|
||||||
|
@ -239,7 +235,7 @@ inline_doc
|
||||||
DEP_XML=`grep "^$DEP[[:space:]]" ../packages | cut -f2`
|
DEP_XML=`grep "^$DEP[[:space:]]" ../packages | cut -f2`
|
||||||
echo -e "\t\tDEP_XML is $DEP_XML\n" >> depure.txt
|
echo -e "\t\tDEP_XML is $DEP_XML\n" >> depure.txt
|
||||||
case $DEP in
|
case $DEP in
|
||||||
x-window-system ) ;; # No page for that (proper link must be created when generating the book)
|
x-window-system | alsa ) ;; # No page for that (proper link must be created when generating the book)
|
||||||
xorg7 ) ;; # This page will be dump in the xorg7.xinc file
|
xorg7 ) ;; # This page will be dump in the xorg7.xinc file
|
||||||
* )
|
* )
|
||||||
# Remove the Xinclude entry if found
|
# Remove the Xinclude entry if found
|
||||||
|
@ -254,9 +250,8 @@ inline_doc
|
||||||
# If not already created, create its dependencies list
|
# If not already created, create its dependencies list
|
||||||
if [[ ! -f dependencies/$DEP.dep ]] ; then
|
if [[ ! -f dependencies/$DEP.dep ]] ; then
|
||||||
case $DEP in
|
case $DEP in
|
||||||
alsa-lib ) ;; # Only one optional dependency and is recursive.
|
# Skip the creation when all dependencies are circular.
|
||||||
# When placed inside the circular dependencies handler
|
alsa-lib | cracklib | libexif | unixodbc ) ;;
|
||||||
# some packages may bomb. But I don't know yet why
|
|
||||||
# Meta-packages at dependency level (ugly *.dep files, but work for now)
|
# Meta-packages at dependency level (ugly *.dep files, but work for now)
|
||||||
alsa ) # When dependency "alsa", use all alsa-* packages
|
alsa ) # When dependency "alsa", use all alsa-* packages
|
||||||
echo -e "alsa-oss\nalsa-firmware\nalsa-tools\nalsa-utils\n \
|
echo -e "alsa-oss\nalsa-firmware\nalsa-tools\nalsa-utils\n \
|
||||||
|
|
Reference in a new issue