Author: dj
Date: Sat Dec 22 20:33:29 2018
New Revision: 20861
Log:
Merge to TRUNK 20860.
Modified:
branches/BOOK-elogind/general.ent
branches/BOOK-elogind/introduction/welcome/changelog.xml
branches/BOOK-elogind/networking/netutils/networkmanager.xml
Modified: branches/BOOK-elogind/general.ent
==============================================================================
--- branches/BOOK-elogind/general.ent Sat Dec 22 20:19:35 2018 (r20860)
+++ branches/BOOK-elogind/general.ent Sat Dec 22 20:33:29 2018 (r20861)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "22"> <!-- Always 2 digits -->
+<!ENTITY day "23"> <!-- Always 2 digits -->
<!ENTITY month "12"> <!-- Always 2 digits -->
<!ENTITY year "2018">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "December 22nd, &year;">
+<!ENTITY releasedate "December 23rd, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: branches/BOOK-elogind/introduction/welcome/changelog.xml
==============================================================================
--- branches/BOOK-elogind/introduction/welcome/changelog.xml Sat Dec 22
20:19:35 2018 (r20860)
+++ branches/BOOK-elogind/introduction/welcome/changelog.xml Sat Dec 22
20:33:29 2018 (r20861)
@@ -42,6 +42,15 @@
</listitem>
-->
<listitem>
+ <para>December 23rd, 2018</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dj] - Correct NetworkManager meson options.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>December 22nd, 2018</para>
<itemizedlist>
<listitem>
Modified: branches/BOOK-elogind/networking/netutils/networkmanager.xml
==============================================================================
--- branches/BOOK-elogind/networking/netutils/networkmanager.xml Sat Dec
22 20:19:35 2018 (r20860)
+++ branches/BOOK-elogind/networking/netutils/networkmanager.xml Sat Dec
22 20:33:29 2018 (r20861)
@@ -104,7 +104,6 @@
<xref linkend="nss"/>,
<xref linkend="polkit"/>,
<xref linkend="pygobject3"/>,
- <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
<phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
<xref linkend="upower"/>,
<xref linkend="vala"/>, and
@@ -163,14 +162,17 @@
meson --prefix /usr \
--sysconfdir /etc \
--localstatedir /var \
- -Ddocs=true \
- -Dnmtui=true \
- -Dppp=false \
+ -Djson_validation=false \
-Dlibaudit=no \
-Dlibnm_glib=true \
+ -Dlibpsl=false \
+ -Dnmtui=true \
+ -Dovs=false \
+ -Dppp=false \
-Dselinux=false \
-Dudev_dir=/lib/udev \
-Dsession_tracking=elogind \
+ -Dmodem_manager=false \
-Dsystemdsystemunitdir=no \
-Dsystemd_journal=false \
-Dqt=false \
@@ -184,15 +186,18 @@
meson --prefix /usr \
--sysconfdir /etc \
--localstatedir /var \
- -Ddocs=true \
- -Dnmtui=true \
- -Dppp=false \
+ -Djson_validation=false \
-Dlibaudit=no \
-Dlibnm_glib=true \
+ -Dlibpsl=false \
+ -Dnmtui=true \
+ -Dovs=false \
+ -Dppp=false \
-Dselinux=false \
-Dqt=false \
-Dudev_dir=/lib/udev \
-Dsession_tracking=systemd \
+ -Dmodem_manager=false \
-Dsystemdsystemunitdir=/lib/systemd/system \
.. &&
ninja</userinput></screen>
@@ -221,8 +226,8 @@
</para>
<para>
- <parameter>-Ddocs=true</parameter>: This parameter enable building of
- man pages and documentation.
+ <parameter>-Ddocs=true</parameter>: Use this switch to enable building of
+ man pages and documentation if <xref linkend="gtk-doc"/> is installed.
</para>
<para>
@@ -236,6 +241,19 @@
used for sysv init systems.
</para>
+ <para>
+ <parameter>-Djson_validation=false</parameter>,
+ <parameter>-Dlibpsl=false</parameter>, and
+ <parameter>-Dovs=false</parameter>: These switches disable build with the
+ respective libraries. Remove if you have the needed libraries installed.
+ </para>
+
+ <para>
+ <parameter>-Dmodem_manager=false</parameter>: This switch is requried if
+ <application>ModemManager</application> is not installed. Omit if you
+ have built <application>ModmeManager</application>.
+ </para>
+
<para revision="sysv">
<parameter>-Dsession_tracking=elogind</parameter>: This switch
is used to set <command>elogind</command> as the default
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
