[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. e87c833bb4f8fd636f4ba23168685f4bd7edb318
git
git at cross-lfs.org
Mon Nov 12 13:50:05 PST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via e87c833bb4f8fd636f4ba23168685f4bd7edb318 (commit)
via 3d8b4f63ebad901e2fa0d22812f60b64731eeb2c (commit)
from 01672b830d95c49053dce3f98074e1897ef27efc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e87c833bb4f8fd636f4ba23168685f4bd7edb318
Author: Chris Staub <chris at beaker67.com>
Date: Mon Nov 12 16:49:56 2012 -0500
Simplified 64-bit boot shadow with xincludes
diff --git a/BOOK/boot/64/shadow.xml b/BOOK/boot/64/shadow.xml
index b67bf50..1317153 100644
--- a/BOOK/boot/64/shadow.xml
+++ b/BOOK/boot/64/shadow.xml
@@ -22,45 +22,57 @@
<sect2 role="installation">
<title>Installation of Shadow</title>
- <para os="b">Disable the installation of the <command>groups</command>
- program, as Coreutils provides a better version:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
-<screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
-sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
- <para os="t1">The following cache entries set the values for tests that do
- not run while cross-compiling:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='t1'])"/>
-<screen os="t2"><userinput>echo "ac_cv_func_setpgrp_void=yes" > config.cache</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='t2'])"/>
- <para os="d">Prepare Shadow for compilation:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
<screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} --sysconfdir=/etc \
--cache-file=config.cache</userinput></screen>
-<para os="f">The meaning of the configure options:</para>
-
- <variablelist os="g">
- <varlistentry>
- <term><parameter>--sysconfdir=/etc</parameter></term>
- <listitem><para>Tells Shadow to install its configuration files into
- <filename class="directory">/etc</filename>, rather than
- <filename class="directory">/tools/etc</filename>.</para></listitem>
- </varlistentry>
-
- </variablelist>
-
-
- <para os="h">Compile the package:</para>
-
-<screen os="i"><userinput>make</userinput></screen>
-
- <para os="j">This package does not come with a test suite.</para>
-
- <para os="k">Install the package:</para>
-
-<screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
</sect2>
diff --git a/BOOK/boot/multilib/shadow.xml b/BOOK/boot/multilib/shadow.xml
deleted file mode 100644
index b67bf50..0000000
--- a/BOOK/boot/multilib/shadow.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-boot-shadow" role="wrap">
- <?dbhtml filename="shadow.html"?>
-
- <title>Shadow-&shadow-version;</title>
-
- <indexterm zone="ch-boot-shadow">
- <primary sortas="a-Shadow">Shadow</primary>
- <secondary>boot</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/shadow.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Shadow</title>
-
- <para os="b">Disable the installation of the <command>groups</command>
- program, as Coreutils provides a better version:</para>
-
-<screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
-sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
-
- <para os="t1">The following cache entries set the values for tests that do
- not run while cross-compiling:</para>
-
-<screen os="t2"><userinput>echo "ac_cv_func_setpgrp_void=yes" > config.cache</userinput></screen>
-
- <para os="d">Prepare Shadow for compilation:</para>
-
-<screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} --sysconfdir=/etc \
- --cache-file=config.cache</userinput></screen>
-
-<para os="f">The meaning of the configure options:</para>
-
- <variablelist os="g">
- <varlistentry>
- <term><parameter>--sysconfdir=/etc</parameter></term>
- <listitem><para>Tells Shadow to install its configuration files into
- <filename class="directory">/etc</filename>, rather than
- <filename class="directory">/tools/etc</filename>.</para></listitem>
- </varlistentry>
-
- </variablelist>
-
-
- <para os="h">Compile the package:</para>
-
-<screen os="i"><userinput>make</userinput></screen>
-
- <para os="j">This package does not come with a test suite.</para>
-
- <para os="k">Install the package:</para>
-
-<screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-shadow" role="."/></para>
- </sect2>
-
-</sect1>
commit 3d8b4f63ebad901e2fa0d22812f60b64731eeb2c
Author: Chris Staub <chris at beaker67.com>
Date: Mon Nov 12 16:38:20 2012 -0500
Removed redundant xml file
diff --git a/BOOK/boot/mips64-chapter.xml b/BOOK/boot/mips64-chapter.xml
index 53092b1..af940d5 100644
--- a/BOOK/boot/mips64-chapter.xml
+++ b/BOOK/boot/mips64-chapter.xml
@@ -16,7 +16,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
diff --git a/BOOK/boot/ppc64-chapter.xml b/BOOK/boot/ppc64-chapter.xml
index 656a045..9949138 100644
--- a/BOOK/boot/ppc64-chapter.xml
+++ b/BOOK/boot/ppc64-chapter.xml
@@ -16,7 +16,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/util-linux-32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
diff --git a/BOOK/boot/sparc64-chapter.xml b/BOOK/boot/sparc64-chapter.xml
index 8d5a203..e7091ce 100644
--- a/BOOK/boot/sparc64-chapter.xml
+++ b/BOOK/boot/sparc64-chapter.xml
@@ -15,7 +15,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
diff --git a/BOOK/boot/x86_64-chapter.xml b/BOOK/boot/x86_64-chapter.xml
index 64d8364..328ac31 100644
--- a/BOOK/boot/x86_64-chapter.xml
+++ b/BOOK/boot/x86_64-chapter.xml
@@ -15,7 +15,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/shadow.xml | 72 +++++++++++++++++++++++----------------
BOOK/boot/mips64-chapter.xml | 2 +-
BOOK/boot/multilib/shadow.xml | 74 -----------------------------------------
BOOK/boot/ppc64-chapter.xml | 2 +-
BOOK/boot/sparc64-chapter.xml | 2 +-
BOOK/boot/x86_64-chapter.xml | 2 +-
6 files changed, 46 insertions(+), 108 deletions(-)
delete mode 100644 BOOK/boot/multilib/shadow.xml
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list