Author: bdubbs
Date: Mon Dec 17 11:05:10 2018
New Revision: 20835
Log:
Clean up python modules.
Remove unneeded funcsigs and beaker.
Remove unneeded python2 builds of markupsafe and mako.
Modified:
trunk/BOOK/general/prog/mako.xml
trunk/BOOK/general/prog/markupsafe.xml
trunk/BOOK/general/prog/python-modules.xml
trunk/BOOK/introduction/welcome/changelog.xml
Modified: trunk/BOOK/general/prog/mako.xml
==============================================================================
--- trunk/BOOK/general/prog/mako.xml Mon Dec 17 10:22:52 2018 (r20834)
+++ trunk/BOOK/general/prog/mako.xml Mon Dec 17 11:05:10 2018 (r20835)
@@ -70,7 +70,7 @@
<bridgehead renderas="sect5">Required</bridgehead>
<para role="required">
- <xref linkend="Beaker"/> and
+<!-- <xref linkend="Beaker"/> and -->
<xref linkend="MarkupSafe"/>
</para>
@@ -81,7 +81,7 @@
<sect3 role="installation">
<title>Installation of Mako</title>
-
+<!--
<note>
<para>
Both <application>Python 2</application> and
@@ -89,28 +89,27 @@
be built and installed without any conflicts.
</para>
</note>
-
+-->
<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
+<!--
<para>
To install the <application>Python 2</application> module,
run the following command as the
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>python setup.py install
--optimize=1</userinput></screen>
-
+<screen role="root"><userinput>python setup.py install -
-optimize=1</userinput></screen>
+-->
<para>
To install the <application>Python 3</application> module,
run the following command as the
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>sed -i "s:mako-render:&3:g" setup.py
&&
-python3 setup.py install --optimize=1</userinput></screen>
-
+<!--sed -i "s:mako-render:&3:g" setup.py &&-->
+<screen role="root"><userinput>python3 setup.py install
--optimize=1</userinput></screen>
</sect3>
-
+<!--
<sect3 role="commands">
<title>Command Explanations</title>
@@ -123,7 +122,7 @@
</para>
</sect3>
-
+-->
<sect3 role="content">
<title>Contents</title>
@@ -134,15 +133,15 @@
<seglistitem>
<seg>
- mako-render and/or mako-render3
+ <!--mako-render and/or--> mako-render3
</seg>
<seg>
None
</seg>
<seg>
- /usr/lib/python&python2-majorver;/site-packages/mako,
-
/usr/lib/python&python2-majorver;/site-packages/Mako-&mako-version;-py&python2-majorver;.egg-info
and/or
- /usr/lib/python&python3-majorver;/site-packages/mako,
+<!-- /usr/lib/python&python2-majorver;/site-packages/mako,
+
/usr/lib/python&python2-majorver;/site-packages/Mako-&mako-version;-py&python2-majorver;.egg-info
and/or-->
+ /usr/lib/python&python3-majorver;/site-packages/mako and
/usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;-py&python3-majorver;.egg-info
</seg>
</seglistitem>
Modified: trunk/BOOK/general/prog/markupsafe.xml
==============================================================================
--- trunk/BOOK/general/prog/markupsafe.xml Mon Dec 17 10:22:52 2018
(r20834)
+++ trunk/BOOK/general/prog/markupsafe.xml Mon Dec 17 11:05:10 2018
(r20835)
@@ -81,7 +81,7 @@
<sect3 role="installation">
<title>Installation of MarkupSafe</title>
-
+<!--
<note>
<para>
Both <application>Python 2</application> and
@@ -89,9 +89,9 @@
be built and installed without any conflicts.
</para>
</note>
-
+-->
<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
+<!--
<para>
To build the <application>Python 2</application> module,
run the following command:
@@ -105,8 +105,8 @@
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>python setup.py install
--optimize=1</userinput></screen>
-
+<screen role="root"><userinput>python setup.py install -
-optimize=1</userinput></screen>
+-->
<para>
To build the <application>Python 3</application> module,
run the following command:
@@ -140,9 +140,9 @@
None
</seg>
<seg>
- /usr/lib/python&python2-majorver;/site-packages/markupsafe,
-
/usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info
and/or
- /usr/lib/python&python3-majorver;/site-packages/markupsafe,
+i<!-- /usr/lib/python&python2-majorver;/site-packages/markupsafe,
+
/usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info
and/or-->
+ /usr/lib/python&python3-majorver;/site-packages/markupsafe and
/usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python3-majorver;.egg-info
</seg>
</seglistitem>
Modified: trunk/BOOK/general/prog/python-modules.xml
==============================================================================
--- trunk/BOOK/general/prog/python-modules.xml Mon Dec 17 10:22:52 2018
(r20834)
+++ trunk/BOOK/general/prog/python-modules.xml Mon Dec 17 11:05:10 2018
(r20835)
@@ -74,7 +74,7 @@
<xref linkend="pyxdg"/>
</para>
</listitem>
- <listitem>
+<!-- <listitem>
<para>
<xref linkend="funcsigs"/>
</para>
@@ -83,7 +83,7 @@
<para>
<xref linkend="Beaker"/>
</para>
- </listitem>
+ </listitem> -->
<listitem>
<para>
<xref linkend="libxml2py2"/>
@@ -165,8 +165,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="funcsigs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="beaker.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="beaker.xml"/>-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libxml2py2.xml"/>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Mon Dec 17 10:22:52
2018 (r20834)
+++ trunk/BOOK/introduction/welcome/changelog.xml Mon Dec 17 11:05:10
2018 (r20835)
@@ -46,6 +46,11 @@
<para>December 17th, 2018</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Clean up python modules. Remove unneeded
+ funcsigs and beaker. Remove unneeded python2 builds of markupsafe
+ and mako.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Update to xterm-340. Fixes
<ulink url="&blfs-ticket-root;11456">#11456</ulink>.</para>
</listitem>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
