Author: pierre
Date: Wed Jan 23 05:08:32 2019
New Revision: 21022
Log:
Fix libbytsize building and testing with only P3
Scour requires six
Modified:
trunk/BOOK/general/genlib/libbytesize.xml
trunk/BOOK/general/prog/scour.xml
trunk/BOOK/introduction/welcome/changelog.xml
Modified: trunk/BOOK/general/genlib/libbytesize.xml
==============================================================================
--- trunk/BOOK/general/genlib/libbytesize.xml Wed Jan 23 03:05:19 2019
(r21021)
+++ trunk/BOOK/general/genlib/libbytesize.xml Wed Jan 23 05:08:32 2019
(r21022)
@@ -81,7 +81,7 @@
<para role="optional">
<xref linkend="gtk-doc"/>,
<xref linkend="python2"/>,
- <xref linkend="six"/> (python module for tests),
+ <xref linkend="six"/> (needed for tests and python bindings),
<ulink
url="https://github.com/rhinstaller/pocketlint/releases";>pocketlint</ulink>
(python module for one test), and
<ulink url="https://pypi.python.org/pypi/polib";>polib</ulink> (python
module for one test)
</para>
@@ -105,7 +105,13 @@
<para>
If you have the optional python modules installed, the regression
- tests can be run with: <command>make check</command>.
+ tests can be run with: <command>make check</command>. If only
+ <application>Python 3</application> is installed, one test has to be
+ fixed with <command>
+ sed -i 's/python/&3/' tests/lbs_py_override_unittest.py</command>.
+ <phrase revision='sysv'>Another test needs to be fixed if systemd
+ is not installed, with:<command>
+ sed -i '/busctl/s/=.*$/=lfs/' tests/canary_tests.sh</command>.</phrase>
</para>
<para>
@@ -120,8 +126,11 @@
<title>Command Explanations</title>
<para>
- <option>--with-python3</option>: Use this switch to prefer Python 3 if
- both Python 2 and Python 3 are installed.
+ <option>--without-python2</option>: If
+ <application>Python 2</application> is installed, use this switch to
+ prevent the use of <application>Python 2</application>. This may be
+ required to run the tests, if some of the needed python modules have been
+ installed for <application>Python 3</application> only.
</para>
</sect2>
Modified: trunk/BOOK/general/prog/scour.xml
==============================================================================
--- trunk/BOOK/general/prog/scour.xml Wed Jan 23 03:05:19 2019 (r21021)
+++ trunk/BOOK/general/prog/scour.xml Wed Jan 23 05:08:32 2019 (r21022)
@@ -68,8 +68,11 @@
<bridgehead renderas="sect4">Scour Dependencies</bridgehead>
- <!-- Required: only setuptools, which is available from our Python and
- Python3 installs via pypi (it has a recursive dependency) -->
+ <bridgehead renderas="sect5">Required</bridgehead>
+ <para role="required">
+ <xref linkend="six"/> (will be automatically downloaded and installed
+ if not already present)
+ </para>
<bridgehead renderas="sect5">Recommended</bridgehead>
<para role="recommended">
@@ -83,11 +86,6 @@
</para>
</note>
- <bridgehead renderas="sect5">Optional (for the main test)</bridgehead>
- <para role="optional">
- <xref linkend="six"/>
- </para>
-
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/scour"/>
</para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Wed Jan 23 03:05:19
2019 (r21021)
+++ trunk/BOOK/introduction/welcome/changelog.xml Wed Jan 23 05:08:32
2019 (r21022)
@@ -45,6 +45,14 @@
<para>January 23rd, 2018</para>
<itemizedlist>
<listitem>
+ <para>[pierre] - Six is required for scour and will be downloaded
+ automatically if not already installed.</para>
+ </listitem>
+ <listitem>
+ <para>[pierre] - Update instructions for libbytesize to allow
+ building and testing without Python 2.</para>
+ </listitem>
+ <listitem>
<para>[ken] - Change the 'Caution' on the rustc page (about running
the testsuite on AMD Ryzens) to a 'Note', the reboot problem was
almost certainly kernel triple-faults on an -rc kernel, although
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
