[lfs-book] r11385 - trunk/BOOK

Pierre Labastie pierrot.labastie at gmail.com
Fri Mar 16 10:31:58 PDT 2018


On 16/03/2018 18:17, Bruce Dubbs wrote:
> On 03/16/2018 11:38 AM, pierre at higgs.linuxfromscratch.org wrote:
>> Author: pierre
>> Date: Fri Mar 16 09:38:24 2018
>> New Revision: 11385
>>
>> Log:
>> Makefile: for pdf rendering:
>> - fix the required disk space for LFS-Bootscripts (use lfs-full instead of
>> lfs-html2)
>> - copy the images to RENDERTMP so that they appear in notes/warnings et al
>>
>> Modified:
>>     trunk/BOOK/Makefile
>>
>> Modified: trunk/BOOK/Makefile
>> ==============================================================================
>> --- trunk/BOOK/Makefile    Mon Mar  5 18:40:52 2018    (r11384)
>> +++ trunk/BOOK/Makefile    Fri Mar 16 09:38:24 2018    (r11385)
>> @@ -71,7 +71,7 @@
>>                   --stringparam profile.condition pdf \
>>                   --output $(RENDERTMP)/lfs-pdf.xml   \
>>                   stylesheets/lfs-xsl/profile.xsl     \
>> -                $(RENDERTMP)/lfs-html2.xml
>> +                $(RENDERTMP)/lfs-full.xml
>>         @echo "Generating FO file..."
>>       $(Q)xsltproc --nonet                           \
>> @@ -84,11 +84,10 @@
>>       $(Q)bash pdf-fixups.sh $(RENDERTMP)/lfs-pdf.fo
>>         @echo "Generating PDF file..."
>> -    $(Q)mkdir -p $(BASEDIR)
>> +    $(Q)mkdir -p $(RENDERTMP)/images
>> +    $(Q)cp images/*.png $(RENDERTMP)/images
>>   -    @echo "Copying images to destination..."
>> -    $(Q)mkdir -p $(BASEDIR)/images
>> -    $(Q)cp images/*.png $(BASEDIR)/images
>> +    $(Q)mkdir -p $(BASEDIR)
>>         $(Q)fop -q  $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT) 2>fop.log
>>       @echo "$(BASEDIR)/$(PDF_OUTPUT) created"
>>
>
> I'm not sure how this will work out with regard to disk space.  We only make
> the pdf version of released books and one of the checklist items is:
>
> 1. In sandbox:
>    cd ~/LFS/tags
>    svn cp ../trunk/BOOK new-tag
>    edit general.ent and edit
>      version (x.y-rc?), short-version, generic-version, releasedate
>    edit packages.ent and make permanent
>       BOOTSCRIPTS-{SIZE,MD5SUM,INSTALL-KB}
>    edit changelog with release entry
>    commit
>
>   -- Bruce

I do not see the point about disk space: lfs-full.xml is generated by the
"validate" target anyway. It can be used in the "pdf" target, since that
target depends on "validate".

And for the images, they do not have to be in BASEDIR (for pdf; it's another
story for html). But they have to be in RENDERTMP (which can be erased after
rendering if disk space is tight), so that fop find them and include them into
the pdf.

The (first) change I've made allows a user to render the book into pdf format
from trunk, with figures instead of text in BOOTSCRIPTS-{SIZE,MD5SUM,INSTALL-KB}



More information about the lfs-book mailing list