Changeset 3757ae7

Timestamp:

12/23/2018 04:33:29 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

6d8b45a3

Parents:

984d05e7

Message:

Merge to TRUNK 20860.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/BOOK-elogind@20861 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netutils/networkmanager.xml (modified) (5 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7 +7 @@
 <!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 #] -->

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <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>

networking/netutils/networkmanager.xml

@@ -105 +105 @@
       <xref linkend="polkit"/>,
       <xref linkend="pygobject3"/>,
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
       <phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
       <xref linkend="upower"/>,
@@ -164 +163 @@
       --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    \
@@ -185 +187 @@
       --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 \
       .. &amp;&amp;
@@ -222 +227 @@
 
     <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>
 
@@ -235 +240 @@
       <parameter>-Dsystemd_journal=false</parameter>: systemd is not
       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>