Changeset c41b38f


Ignore:
Timestamp:
08/07/2014 09:17:28 AM (7 years ago)
Author:
Igor Živković <igor@…>
Branches:
10.0, 10.1, 11.0, 7.10, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, krejzi/svn, lazarus, nosym, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
6d3005f
Parents:
3d8851e
Message:

Update to qemu-2.1.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13847 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r3d8851e rc41b38f  
    22# By Tushar Teredesai <tushar@linuxfromscratch.org>
    33# 2004-01-31
    4 # $LastChangedBy$
    5 # $Date$
    64
    75# Adjust these to suit your installation
    86BASEDIR ?= $(HOME)/public_html/blfs-book-xsl
    97DUMPDIR ?= $(HOME)/blfs-commands
    10 RENDERTMP ?= tmp
     8RENDERTMP ?= /tmp
    119CHUNK_QUIET = 1
    1210ROOT_ID =
    13 #PDF_OUTPUT = BLFS-BOOK.pdf
    1411NOCHUNKS_OUTPUT = BLFS-BOOK.html
    15 SHELL = /bin/bash
     12SHELL = /bin/sh
    1613
    1714ALLXML := $(filter-out $(RENDERTMP)/%, \
     
    2724
    2825blfs: html wget-list
    29 #all: blfs nochunks pdf
    3026all: blfs nochunks
    3127world: all blfs-patch-list dump-commands test-links
     
    5450          tidy -config tidy.conf $$filename; \
    5551          true; \
    56           bash obfuscate.sh $$filename; \
     52          sh obfuscate.sh $$filename; \
    5753          sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
    5854        done;
    59 
    60 #pdf: $(BASEDIR)/$(PDF_OUTPUT)
    61 #$(RENDERTMP)/blfs-pdf.xml: $(RENDERTMP)/blfs-full.xml
    62 #       @echo "Generating profiled XML for PDF..."
    63 #       $(Q)xsltproc --nonet --stringparam profile.condition pdf \
    64           --output $(RENDERTMP)/blfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
    65           $(RENDERTMP)/blfs-full.xml
    66 
    67 #$(RENDERTMP)/blfs-pdf.fo: $(RENDERTMP)/blfs-pdf.xml
    68 #       @echo "Generating FO file..."
    69 #       $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
    70           --output $(RENDERTMP)/blfs-pdf.fo stylesheets/blfs-pdf.xsl \
    71           $(RENDERTMP)/blfs-pdf.xml
    72 #       $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/blfs-pdf.fo
    73 
    74 #$(BASEDIR)/$(PDF_OUTPUT): $(RENDERTMP)/blfs-pdf.fo
    75 #       @echo "Generating PDF file..."
    76 #       $(Q)if [ ! -e $(BASEDIR) ]; then \
    77           mkdir -p $(BASEDIR); \
    78         fi;
    79 #       $(Q)fop $(RENDERTMP)/blfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
    8055
    8156nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
     
    10075        @echo "Cleaning $(RENDERTMP)"
    10176        $(Q)rm -f $(RENDERTMP)/blfs-{full,html}.xml
    102 #       $(Q)rm -f $(RENDERTMP)/blfs-{full,html,pdf}.xml
    103 #       $(Q)rm -f $(RENDERTMP)/blfs-pdf.fo
    10477        $(Q)rm -f $(RENDERTMP)/blfs-{patch-list,patches}
    10578        $(Q)rmdir $(RENDERTMP) 2>/dev/null || :
     
    161134        done
    162135
    163 bootscripts:
    164         @VERSION=`grep "bootscripts-version " general.ent | cut -d\" -f2`; \
    165    BOOTSCRIPTS="blfs-bootscripts-$$VERSION"; \
    166    if [ ! -e $$BOOTSCRIPTS.tar.xz ]; then \
    167      rm -rf $(RENDERTMP)/$$BOOTSCRIPTS; \
    168      mkdir $(RENDERTMP)/$$BOOTSCRIPTS; \
    169      cp -a ../bootscripts/* $(RENDERTMP)/$$BOOTSCRIPTS; \
    170      rm -rf ../bootscripts/archive; \
    171      tar  -cJhf $$BOOTSCRIPTS.tar.xz -C $(RENDERTMP) $$BOOTSCRIPTS; \
    172    fi
    173 
    174136dump-commands: $(DUMPDIR)
    175137$(DUMPDIR): $(RENDERTMP)/blfs-full.xml
     
    184146
    185147.PHONY: blfs all world html nochunks tmpdir clean validxml \
    186         profile-html wget-list test-links dump-commands validate \
    187    bootscripts
    188 
    189 #.PHONY: blfs all world html pdf nochunks tmpdir clean validxml \
    190148        profile-html wget-list test-links dump-commands validate
  • general.ent

    r3d8851e rc41b38f  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "06">                   <!-- Always 2 digits -->
     3<!ENTITY day          "07">                   <!-- Always 2 digits -->
    44<!ENTITY month        "08">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2014">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "August 6th, &year;">
     9<!ENTITY releasedate  "August 7th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    r3d8851e rc41b38f  
    4444
    4545-->
     46
     47    <listitem>
     48      <para>August 7th, 2014</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[igor] - Update to qemu-2.1.0. Fixes
     52          <ulink url="&blfs-ticket-root;5318">#5318</ulink>.</para>
     53        </listitem>
     54      </itemizedlist>
     55    </listitem>
    4656
    4757    <listitem>
  • obfuscate.sh

    r3d8851e rc41b38f  
    1 #!/bin/bash
    2 
    3 # $LastChangedBy$
    4 # $Date$
     1#!/bin/sh
    52
    63# obfuscate.sh
     
    3431  link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
    3532  plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
    36   cp ${1}{,.tmp}
     33  cp ${1} ${1}.tmp
    3734  sed -e "s|mailto:$i|mailto:$link|" \
    3835      -e "s|$i|$plaintext|" ${1}.tmp > ${1}
  • packages.ent

    r3d8851e rc41b38f  
    6262
    6363<!-- Chapter 8 Virtualization -->
    64 <!ENTITY qemu-version                 "2.0.0">
     64<!ENTITY qemu-version                 "2.1.0">
    6565
    6666<!-- Part III -->
  • postlfs/virtualization/qemu.xml

    r3d8851e rc41b38f  
    77  <!ENTITY qemu-download-http "http://wiki.qemu.org/download/qemu-&qemu-version;.tar.bz2">
    88  <!ENTITY qemu-download-ftp  " ">
    9   <!ENTITY qemu-md5sum        "2790f44fd76da5de5024b4aafeb594c2">
    10   <!ENTITY qemu-size          "12.3 MB">
    11   <!ENTITY qemu-buildsize     "205 MB">
    12   <!ENTITY qemu-time          "1.8 SBU">
     9  <!ENTITY qemu-md5sum        "6726977292b448cbc7f89998fac6983b">
     10  <!ENTITY qemu-size          "23 MB">
     11  <!ENTITY qemu-buildsize     "287 MB">
     12  <!ENTITY qemu-time          "1.4 SBU">
    1313]>
    1414
     
    6363    <para role="required">
    6464      <xref linkend="glib2"/>,
    65       <xref linkend="python2"/>,
    66       <xref linkend="sdl"/>, and
     65      <xref linkend="python2"/>, and
    6766      <xref linkend="x-window-system"/>
     67    </para>
     68
     69    <bridgehead renderas="sect4">Recommended</bridgehead>
     70    <para role="recommended">
     71      <xref linkend="sdl"/>
    6872    </para>
    6973
Note: See TracChangeset for help on using the changeset viewer.