mirror of
https://github.com/Zeckmathederg/glfs.git
synced 2025-01-23 22:42:14 +08:00
Update to qemu-2.1.0.
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13847 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Igor Živković
parent
3d8851e27f
commit
c41b38ff6b
48
Makefile
48
Makefile
@ -1,18 +1,15 @@
|
||||
# Makefile for BLFS Book generation.
|
||||
# By Tushar Teredesai <tushar@linuxfromscratch.org>
|
||||
# 2004-01-31
|
||||
# $LastChangedBy$
|
||||
# $Date$
|
||||
|
||||
# Adjust these to suit your installation
|
||||
BASEDIR ?= $(HOME)/public_html/blfs-book-xsl
|
||||
DUMPDIR ?= $(HOME)/blfs-commands
|
||||
RENDERTMP ?= tmp
|
||||
RENDERTMP ?= /tmp
|
||||
CHUNK_QUIET = 1
|
||||
ROOT_ID =
|
||||
#PDF_OUTPUT = BLFS-BOOK.pdf
|
||||
NOCHUNKS_OUTPUT = BLFS-BOOK.html
|
||||
SHELL = /bin/bash
|
||||
SHELL = /bin/sh
|
||||
|
||||
ALLXML := $(filter-out $(RENDERTMP)/%, \
|
||||
$(wildcard *.xml */*.xml */*/*.xml */*/*/*.xml */*/*/*/*.xml))
|
||||
@ -26,7 +23,6 @@ else
|
||||
endif
|
||||
|
||||
blfs: html wget-list
|
||||
#all: blfs nochunks pdf
|
||||
all: blfs nochunks
|
||||
world: all blfs-patch-list dump-commands test-links
|
||||
|
||||
@ -53,31 +49,10 @@ $(BASEDIR)/index.html: $(RENDERTMP)/blfs-html.xml
|
||||
$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
|
||||
tidy -config tidy.conf $$filename; \
|
||||
true; \
|
||||
bash obfuscate.sh $$filename; \
|
||||
sh obfuscate.sh $$filename; \
|
||||
sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
|
||||
done;
|
||||
|
||||
#pdf: $(BASEDIR)/$(PDF_OUTPUT)
|
||||
#$(RENDERTMP)/blfs-pdf.xml: $(RENDERTMP)/blfs-full.xml
|
||||
# @echo "Generating profiled XML for PDF..."
|
||||
# $(Q)xsltproc --nonet --stringparam profile.condition pdf \
|
||||
--output $(RENDERTMP)/blfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
|
||||
$(RENDERTMP)/blfs-full.xml
|
||||
|
||||
#$(RENDERTMP)/blfs-pdf.fo: $(RENDERTMP)/blfs-pdf.xml
|
||||
# @echo "Generating FO file..."
|
||||
# $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
|
||||
--output $(RENDERTMP)/blfs-pdf.fo stylesheets/blfs-pdf.xsl \
|
||||
$(RENDERTMP)/blfs-pdf.xml
|
||||
# $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/blfs-pdf.fo
|
||||
|
||||
#$(BASEDIR)/$(PDF_OUTPUT): $(RENDERTMP)/blfs-pdf.fo
|
||||
# @echo "Generating PDF file..."
|
||||
# $(Q)if [ ! -e $(BASEDIR) ]; then \
|
||||
mkdir -p $(BASEDIR); \
|
||||
fi;
|
||||
# $(Q)fop $(RENDERTMP)/blfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
|
||||
|
||||
nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
|
||||
$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/blfs-html.xml
|
||||
@echo "Generating non-chunked XHTML file..."
|
||||
@ -99,8 +74,6 @@ $(RENDERTMP):
|
||||
clean:
|
||||
@echo "Cleaning $(RENDERTMP)"
|
||||
$(Q)rm -f $(RENDERTMP)/blfs-{full,html}.xml
|
||||
# $(Q)rm -f $(RENDERTMP)/blfs-{full,html,pdf}.xml
|
||||
# $(Q)rm -f $(RENDERTMP)/blfs-pdf.fo
|
||||
$(Q)rm -f $(RENDERTMP)/blfs-{patch-list,patches}
|
||||
$(Q)rmdir $(RENDERTMP) 2>/dev/null || :
|
||||
|
||||
@ -160,17 +133,6 @@ $(BASEDIR)/test-links: $(RENDERTMP)/blfs-full.xml
|
||||
fi; \
|
||||
done
|
||||
|
||||
bootscripts:
|
||||
@VERSION=`grep "bootscripts-version " general.ent | cut -d\" -f2`; \
|
||||
BOOTSCRIPTS="blfs-bootscripts-$$VERSION"; \
|
||||
if [ ! -e $$BOOTSCRIPTS.tar.xz ]; then \
|
||||
rm -rf $(RENDERTMP)/$$BOOTSCRIPTS; \
|
||||
mkdir $(RENDERTMP)/$$BOOTSCRIPTS; \
|
||||
cp -a ../bootscripts/* $(RENDERTMP)/$$BOOTSCRIPTS; \
|
||||
rm -rf ../bootscripts/archive; \
|
||||
tar -cJhf $$BOOTSCRIPTS.tar.xz -C $(RENDERTMP) $$BOOTSCRIPTS; \
|
||||
fi
|
||||
|
||||
dump-commands: $(DUMPDIR)
|
||||
$(DUMPDIR): $(RENDERTMP)/blfs-full.xml
|
||||
@echo "Dumping book commands..."
|
||||
@ -183,8 +145,4 @@ validate:
|
||||
$(Q)xmllint --noout --nonet --xinclude --postvalid index.xml
|
||||
|
||||
.PHONY: blfs all world html nochunks tmpdir clean validxml \
|
||||
profile-html wget-list test-links dump-commands validate \
|
||||
bootscripts
|
||||
|
||||
#.PHONY: blfs all world html pdf nochunks tmpdir clean validxml \
|
||||
profile-html wget-list test-links dump-commands validate
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
<!-- $LastChangedBy$ $Date$ -->
|
||||
|
||||
<!ENTITY day "06"> <!-- Always 2 digits -->
|
||||
<!ENTITY day "07"> <!-- Always 2 digits -->
|
||||
<!ENTITY month "08"> <!-- Always 2 digits -->
|
||||
<!ENTITY year "2014">
|
||||
<!ENTITY copyrightdate "2001-&year;">
|
||||
<!ENTITY copyholder "The BLFS Development Team">
|
||||
<!ENTITY version "&year;-&month;-&day;">
|
||||
<!ENTITY releasedate "August 6th, &year;">
|
||||
<!ENTITY releasedate "August 7th, &year;">
|
||||
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
|
||||
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
|
||||
<!ENTITY lfs-version "development"> <!-- x.y|development] -->
|
||||
|
||||
@ -44,6 +44,16 @@
|
||||
|
||||
-->
|
||||
|
||||
<listitem>
|
||||
<para>August 7th, 2014</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>[igor] - Update to qemu-2.1.0. Fixes
|
||||
<ulink url="&blfs-ticket-root;5318">#5318</ulink>.</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>August 6th, 2014</para>
|
||||
<itemizedlist>
|
||||
|
||||
@ -1,7 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
# $LastChangedBy$
|
||||
# $Date$
|
||||
#!/bin/sh
|
||||
|
||||
# obfuscate.sh
|
||||
# obfuscate email addresses in XML/HTML
|
||||
@ -33,7 +30,7 @@
|
||||
for i in `grep -o '"mailto:.*@.*"' ${1} |cut -d\" -f2|sed -e 's|^mailto:||' -e 's|"$||'`; do
|
||||
link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
|
||||
plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
|
||||
cp ${1}{,.tmp}
|
||||
cp ${1} ${1}.tmp
|
||||
sed -e "s|mailto:$i|mailto:$link|" \
|
||||
-e "s|$i|$plaintext|" ${1}.tmp > ${1}
|
||||
rm ${1}.tmp
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
<!ENTITY zsh-version "5.0.5">
|
||||
|
||||
<!-- Chapter 8 Virtualization -->
|
||||
<!ENTITY qemu-version "2.0.0">
|
||||
<!ENTITY qemu-version "2.1.0">
|
||||
|
||||
<!-- Part III -->
|
||||
<!-- Chapter 9 -->
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
|
||||
<!ENTITY qemu-download-http "http://wiki.qemu.org/download/qemu-&qemu-version;.tar.bz2">
|
||||
<!ENTITY qemu-download-ftp " ">
|
||||
<!ENTITY qemu-md5sum "2790f44fd76da5de5024b4aafeb594c2">
|
||||
<!ENTITY qemu-size "12.3 MB">
|
||||
<!ENTITY qemu-buildsize "205 MB">
|
||||
<!ENTITY qemu-time "1.8 SBU">
|
||||
<!ENTITY qemu-md5sum "6726977292b448cbc7f89998fac6983b">
|
||||
<!ENTITY qemu-size "23 MB">
|
||||
<!ENTITY qemu-buildsize "287 MB">
|
||||
<!ENTITY qemu-time "1.4 SBU">
|
||||
]>
|
||||
|
||||
<sect1 id="qemu" xreflabel="qemu-&qemu-version;">
|
||||
@ -62,11 +62,15 @@
|
||||
<bridgehead renderas="sect4">Required</bridgehead>
|
||||
<para role="required">
|
||||
<xref linkend="glib2"/>,
|
||||
<xref linkend="python2"/>,
|
||||
<xref linkend="sdl"/>, and
|
||||
<xref linkend="python2"/>, and
|
||||
<xref linkend="x-window-system"/>
|
||||
</para>
|
||||
|
||||
<bridgehead renderas="sect4">Recommended</bridgehead>
|
||||
<para role="recommended">
|
||||
<xref linkend="sdl"/>
|
||||
</para>
|
||||
|
||||
<bridgehead renderas="sect4">Optional</bridgehead>
|
||||
<para role="optional">
|
||||
<xref linkend="alsa"/>,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user