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

Finished packages clean-up and version fixes.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-08-18 22:24:11 +00:00
parent fb42452970
commit ec12033bea
2 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
BLFS/gen_config.sh
View file

@ -23,15 +23,28 @@ declare PKG_VER
get_pkg_ver() { get_pkg_ver() {
local this_script=$1 local this_script=$1
# ALSA packages version case ${this_script} in
[[ ${this_script:0:4} = "alsa" ]] && this_script=alsa # ALSA packages version
# KDE packages version alsa* ) this_script=alsa ;;
[[ ${this_script:0:3} = "kde" ]] && [[ ! ${this_script} = "kdevelop" ]] && \
[[ ! ${this_script: -6} = "config" ]] && this_script=kde # KDE packages version
# Xorg7 packages version kdevelop ) : ;;
[[ ${this_script} = "xorg7-server" ]] && this_script=xorg-server kde*config ) : ;;
[[ ${this_script} = "xterm2" ]] && this_script=xterm kde* ) this_script=kde ;;
[[ ${this_script:0:5} = "xorg7" ]] && this_script=xorg7
# Xorg7 packages version
xorg7-server ) this_script=xorg-server ;;
xterm2 ) this_script=xterm ;;
xorg7* ) this_script=xorg7 ;;
# Others (ID value don't match entity name)
wireless_tools ) this_script=wireless-tools ;;
bind-utils ) this_script=bind ;;
html-tidy ) this_script=tidy ;;
jdk ) this_script=jdk-src ;;
reiserfs ) this_script=reiser ;;
xfs ) this_script=xfsprogs ;;
esac
PKG_VER=$(xmllint --noent ./blfs-xml/book/bookinfo.xml 2>/dev/null | \ PKG_VER=$(xmllint --noent ./blfs-xml/book/bookinfo.xml 2>/dev/null | \
grep -i " ${this_script}-version " | cut -d "\"" -f2 ) grep -i " ${this_script}-version " | cut -d "\"" -f2 )
@ -97,13 +110,11 @@ EOF
fi fi
[[ "${SET_COMMENT}" = "y" ]] && echo "comment \"\"" >>$outFile; unset SET_COMMENT [[ "${SET_COMMENT}" = "y" ]] && echo "comment \"\"" >>$outFile; unset SET_COMMENT
# Deal with a few unusable chapter names # Deal with a few unusable (at target level) package names
case ${PKG_NAME} in case ${PKG_NAME} in
xorg7-* ) # Deal with sub-elements of Xorg7, mandatory for build. xorg7-* ) continue ;;
# No need to (even possible?) to build separately
continue
;;
alsa-* ) continue ;; alsa-* ) continue ;;
x-config | x-setup ) continue ;;
esac esac
# IF this package name-version exists in the tracking dir # IF this package name-version exists in the tracking dir

4
BLFS/libs/func_packages
View file

@ -22,8 +22,8 @@ generate_packages() { # Master packages file
sed -i '/obsolete/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp sed -i '/obsolete/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp
sed -i '/courier.xml/d;/-other\t/d;/others-/d;/other-/d' packages.tmp sed -i '/courier.xml/d;/-other\t/d;/others-/d;/other-/d' packages.tmp
sed -i '/fw-firewall/d;/gcc2/d;/cvsserver/d;/svnserver/d' packages.tmp sed -i '/fw-firewall/d;/gcc2/d;/cvsserver/d;/svnserver/d' packages.tmp
sed -i '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d' packages.tmp sed -i '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d;/konq\t/d' packages.tmp
sed -i '/gst-plugins\t/d;/openquicktime\t/d' packages.tmp sed -i '/gst-plugins\t/d;/openquicktime\t/d;/compressdoc\t/d' packages.tmp
# Add header with meta-packages pseudo Id # Add header with meta-packages pseudo Id
{ {