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

Adapt blfs installation to recent changes in BLFS book

Browse source
This commit is contained in:
Pierre Labastie 2013-12-24 18:52:24 +00:00
parent 65d7d462b9
commit c1626d892a
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/libs/func_install_blfs
View file

@ -63,11 +63,12 @@ if [ "$DEP_TIDY" = y ]; then
else else
LINE_TIDY='#CONFIG_html-tidy is not set' LINE_TIDY='#CONFIG_html-tidy is not set'
fi fi
if [ "$DEP_DBXML" = y ]; then # DocBook is a rec dep of libxslt
LINE_DBXML='CONFIG_DocBook=y' # if [ "$DEP_DBXML" = y ]; then
else # LINE_DBXML='CONFIG_DocBook=y'
LINE_DBXML='#CONFIG_DocBook is not set' # else
fi # LINE_DBXML='#CONFIG_DocBook is not set'
# fi
if [ "$DEP_LYNX" = y ]; then if [ "$DEP_LYNX" = y ]; then
LINE_LYNX='CONFIG_lynx=y' LINE_LYNX='CONFIG_lynx=y'
else else
@ -109,7 +110,6 @@ $LINE_PYTHON
$LINE_LIBXML $LINE_LIBXML
$LINE_LIBXSLT $LINE_LIBXSLT
$LINE_TIDY $LINE_TIDY
$LINE_DBXML
$LINE_OPENSSL $LINE_OPENSSL
$LINE_WGET $LINE_WGET
$LINE_SVN $LINE_SVN
@ -146,6 +146,20 @@ popd
rm -v $BUILDDIR$BLFS_ROOT/download_script rm -v $BUILDDIR$BLFS_ROOT/download_script
# Suppresses unneeded parts of the scriptlets # Suppresses unneeded parts of the scriptlets
if [ "$DEP_LIBXSLT" = y ]; then
# libxslt pulls docbook-xsl in. Sorry for sed synthax.
# I do not know how to delete lines between 2 addresses excluding those
# two lines.
sed -i '\@^[[:space:]]*/etc/xml/catalog$@{
n
:a
\@/etc/xml/catalog$@bb
N
ba
:b
d}' \
$BUILDDIR$BLFS_ROOT/scripts/*docbook-xsl
fi
if [ "$DEP_SUDO" = y ]; then if [ "$DEP_SUDO" = y ]; then
sed -i '/pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo sed -i '/pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
fi fi