[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-517-gb2d8061
git
git at cross-lfs.org
Mon Nov 18 07:05:17 PST 2013
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 b2d8061080ddf17885c289caf966b262bc4d6be8 (commit)
via 1e3c0346be7738a99489cdd95523e4a28193b622 (commit)
via bd60f9e8264087b227a7f0cdd0282efefec6913c (commit)
via c847e5d67df2f3c0776e4a799c2901c44f31002e (commit)
from de6e98eab1c8df7b9b34dbaf4152935aee60094a (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 b2d8061080ddf17885c289caf966b262bc4d6be8
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Nov 18 09:05:12 2013 -0600
Add commands for adding dummy groups and users and adjust test suite text, and test suite commands.
diff --git a/BOOK/final-system/common/util-linux.xml b/BOOK/final-system/common/util-linux.xml
index 227905a..a909434 100644
--- a/BOOK/final-system/common/util-linux.xml
+++ b/BOOK/final-system/common/util-linux.xml
@@ -71,8 +71,14 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
<screen os="e"><userinput>make</userinput></screen>
+ <para os="dummy1">Create two <systemitem class="groupname">dummy</systemitem> groups and a <systemitem class="username">dummy</systemitem> user to be used during Util-linux and Coreutils test suites:</para>
+
+<screen os="dummy2"><userinput>echo "dummy1:x:1000:" >> /etc/group
+echo "dummy2:x:1001:dummy" >> /etc/group
+echo "dummy:x:1000:1000::/root:/bin/bash" >> /etc/passwd</userinput></screen>
+
<para os="f">To test the results, issue:
- <userinput>useradd nobody && chown -Rv nobody . && su nobody -s /bin/bash -c "PATH=$PATH make -k check" ; userdel nobody</userinput></para>
+ <userinput>chown -Rv dummy . && su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></para>
<para os="g">Install the package:</para>
diff --git a/BOOK/final-system/multilib/util-linux.xml b/BOOK/final-system/multilib/util-linux.xml
index 777893c..f436133 100644
--- a/BOOK/final-system/multilib/util-linux.xml
+++ b/BOOK/final-system/multilib/util-linux.xml
@@ -43,6 +43,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
+ xpointer="xpointer(//*[@os='dummy1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/util-linux.xml"
+ xpointer="xpointer(//*[@os='dummy2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/util-linux.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 1e3c0346be7738a99489cdd95523e4a28193b622
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Nov 18 09:04:31 2013 -0600
Remove SUBDIRS variable from test command and adjust test suite introduction text.
diff --git a/BOOK/final-system/common/coreutils.xml b/BOOK/final-system/common/coreutils.xml
index 7e53ff5..adb305e 100644
--- a/BOOK/final-system/common/coreutils.xml
+++ b/BOOK/final-system/common/coreutils.xml
@@ -57,57 +57,51 @@
<para os="g">The test suite of Coreutils makes several assumptions about the
presence of system users and groups that are not valid within the minimal
- environment that exists at the moment. Therefore, additional items need
- to be set up before running the tests. Skip down to <quote>Install the
- package</quote> if not running the test suite.</para>
+ environment that exists at the moment. Therefore, we will reuse the dummy
+ groups and user created during Util-linux. Skip down to <quote>Install the
+ package</quote> if not running the test suite and you did not create the
+ dummy groups and users during Util-linux.</para>
- <para os="h">Create two <systemitem class="groupname">dummy</systemitem> groups
- and a <systemitem class="username">dummy</systemitem> user:</para>
-
-<screen os="i"><userinput>echo "dummy1:x:1000:" >> /etc/group
-echo "dummy2:x:1001:dummy" >> /etc/group
-echo "dummy:x:1000:1000::/root:/bin/bash" >> /etc/passwd</userinput></screen>
-
- <para os="j">Now the test suite is ready to be run. First, run
+ <para os="h">Now the test suite is ready to be run. First, run
the tests that are meant to be run as user
<systemitem class="username">root</systemitem>:</para>
-<screen os="k"><userinput>make NON_ROOT_USERNAME=dummy SUBDIRS= check-root</userinput></screen>
+<screen os="i"><userinput>make NON_ROOT_USERNAME=dummy</userinput></screen>
- <para os="l">The testsuite will now be run as the
+ <para os="j">The testsuite will now be run as the
<systemitem class="username">dummy</systemitem> user. Fix the permissions
for a few files to allow this:</para>
-<screen os="m"><userinput>chown -Rv dummy .</userinput></screen>
+<screen os="k"><userinput>chown -Rv dummy .</userinput></screen>
- <para os="n">Then run the remainder of the tests as the
+ <para os="l">Then run the remainder of the tests as the
<systemitem class="username">dummy</systemitem> user:</para>
-<screen os="o"><userinput>su dummy -s /bin/bash \
+<screen os="m"><userinput>su dummy -s /bin/bash \
-c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
- <para os="p">When testing is complete, remove the
+ <para os="n">When testing is complete, remove the
<systemitem class="username">dummy</systemitem> user and groups:</para>
-<screen os="q"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
+<screen os="o"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
- <para os="r">Install the package:</para>
+ <para os="p">Install the package:</para>
-<screen os="s"><userinput>make install</userinput></screen>
+<screen os="q"><userinput>make install</userinput></screen>
- <para os="t">Move programs to the locations specified by the FHS:</para>
+ <para os="r">Move programs to the locations specified by the FHS:</para>
-<screen os="u"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
+<screen os="s"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
mv -v /usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} /bin
mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
- <para os="v">Other Coreutils programs are used by some of the scripts
+ <para os="t">Other Coreutils programs are used by some of the scripts
in the CLFS-Bootscripts package. As <filename
class="directory">/usr</filename> may not be available during the early
stages of booting, those binaries need to be on the root partition:</para>
-<screen os="w"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
+<screen os="u"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
ln -svf ../../bin/install /usr/bin</userinput></screen>
diff --git a/BOOK/final-system/multilib/coreutils.xml b/BOOK/final-system/multilib/coreutils.xml
index b8e9ef2..0328c81 100644
--- a/BOOK/final-system/multilib/coreutils.xml
+++ b/BOOK/final-system/multilib/coreutils.xml
@@ -110,14 +110,6 @@
href="../common/coreutils.xml"
xpointer="xpointer(//*[@os='u'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/coreutils.xml"
- xpointer="xpointer(//*[@os='v'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/coreutils.xml"
- xpointer="xpointer(//*[@os='w'])"/>
-
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit bd60f9e8264087b227a7f0cdd0282efefec6913c
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Nov 18 09:03:43 2013 -0600
Add entries for moving dummy commands to util linux and adjusting util-linux and coreutils test suite text and test commands.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index f0b335b..20108b1 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,21 @@
-->
<listitem>
+ <para>18 November 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Move creation of dummy groups and user to final-system Util-linux.</para>
+ </listitem>
+ <listitem>
+ <para>[William Harrington] - Remove SUBDIRS variable from final-system Coreutils test command.</para>
+ </listitem>
+ <listitem>
+ <para>[William Harrington] - Adjust Util-linux test commands.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>13 November 2013</para>
<itemizedlist>
<listitem>
commit c847e5d67df2f3c0776e4a799c2901c44f31002e
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Nov 18 08:30:05 2013 -0600
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index f52a33f..e4f6d0c 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "11"> <!-- Use two digits -->
<!ENTITY month_name "November">
-<!ENTITY day "16"> <!-- Use two digits -->
+<!ENTITY day "18"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/coreutils.xml | 42 ++++++++++++----------------
BOOK/final-system/common/util-linux.xml | 8 +++++-
BOOK/final-system/multilib/coreutils.xml | 8 -----
BOOK/final-system/multilib/util-linux.xml | 8 +++++
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 15 ++++++++++
6 files changed, 49 insertions(+), 34 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list