Merged r2226 from trunk.
This commit is contained in:
parent
dc1a4e5823
commit
aecc799c07
1 changed files with 8 additions and 5 deletions
5
jhalfs
5
jhalfs
|
@ -221,17 +221,20 @@ extract_commands() {
|
||||||
for i in patches packages ; do rm -f $i ; done
|
for i in patches packages ; do rm -f $i ; done
|
||||||
grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@' \
|
grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@' \
|
||||||
-e '/generic/d' >> packages
|
-e '/generic/d' >> packages
|
||||||
echo `grep "glibc" packages | sed 's@glibc@&-linuxthreads@'` >> packages
|
|
||||||
# Download the vim-lang package if it must be installed
|
# Download the vim-lang package if it must be installed
|
||||||
if [ "$VIMLANG" = "1" ] ; then
|
if [ "$VIMLANG" = "1" ] ; then
|
||||||
echo `grep "vim" packages | sed 's@vim@&-lang@'` >> packages
|
echo `grep "vim" packages | sed 's@vim@&-lang@'` >> packages
|
||||||
fi
|
fi
|
||||||
echo `grep "udev-config-file" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@'` >> packages
|
echo `grep "udev-config-file" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@'` >> packages
|
||||||
|
# This two packages are needed only for 6.1.1
|
||||||
|
if [ "$LFSVRS" = "6.1.1" ] ; then
|
||||||
|
echo `grep "glibc" packages | sed 's@glibc@&-linuxthreads@'` >> packages
|
||||||
# Download the module-init-tools-testsuite package only
|
# Download the module-init-tools-testsuite package only
|
||||||
# if the test suite will be run.
|
# if the test suite will be run.
|
||||||
if [ "$TEST" = "1" ] ; then
|
if [ "$TEST" = "1" ] ; then
|
||||||
echo `grep "module" packages | sed 's@tools@&-testsuite@'` >> packages
|
echo `grep "module" packages | sed 's@tools@&-testsuite@'` >> packages
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
# If we are buildind the UTF-8 branch, the glibc-libidn package is required
|
# If we are buildind the UTF-8 branch, the glibc-libidn package is required
|
||||||
if grep -q "man-db-version" $BOOK/general.ent ; then
|
if grep -q "man-db-version" $BOOK/general.ent ; then
|
||||||
echo `grep "glibc" packages | sed 's@glibc@glibc-libidn@'` >> packages
|
echo `grep "glibc" packages | sed 's@glibc@glibc-libidn@'` >> packages
|
||||||
|
|
Reference in a new issue