Changeset ad4d3fd

Timestamp:

03/11/2019 05:51:17 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

f0f01a4

Parents:

d6464b5

Message:

Update to elogind-241.1.
Remove some unneeded patches and update instrucitons appropriately.

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

Files:

• general/sysutils/dbus.xml (modified) (2 diffs)
• general/sysutils/elogind.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)
• postlfs/security/polkit.xml (modified) (3 diffs)
• x/installing/xorg-server.xml (modified) (4 diffs)

general/sysutils/dbus.xml

@@ -144 +144 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                        \
+<screen revision="sysv"><userinput>./configure --prefix=/usr                        \
+            --sysconfdir=/etc                    \
+            --localstatedir=/var                 \
+            --enable-user-session                \
+            --disable-doxygen-docs               \
+            --disable-xml-docs                   \
+            --disable-static                     \
+            --with-systemduserunitdir=           \
+            --with-systemdsystemunitdir=         \
+            --docdir=/usr/share/doc/dbus-&dbus-version; \
+            --with-console-auth-dir=/run/console \
+            --with-system-pid-file=/run/dbus/pid \
+            --with-system-socket=/run/dbus/system_bus_socket &amp;&amp;
+make</userinput></screen>
+
+<screen revision="systemd"><userinput>./configure --prefix=/usr                        \
             --sysconfdir=/etc                    \
             --localstatedir=/var                 \
@@ -293 +308 @@
     </para>
 
+    <para revision="sysv">
+      <parameter>--with-systemd{user,system}unitdir=</parameter>: These
+      switches disable installation of systemd units on elogind based systems.
+    </para>
     <para>
       <parameter>--with-console-auth-dir=/run/console/</parameter>: This

general/sysutils/elogind.xml

@@ -7 +7 @@
   <!ENTITY elogind-download-http "https://github.com/elogind/elogind/archive/v&elogind-version;/elogind-&elogind-version;.tar.gz">
   <!ENTITY elogind-download-ftp  " ">
-  <!ENTITY elogind-md5sum        "468e027997be922aa11bfa395c7f1fb7">
-  <!ENTITY elogind-size          "1.1 MB">
+  <!ENTITY elogind-md5sum        "31da1e136d0c39b2af610a55c0c51354">
+  <!ENTITY elogind-size          "1.3 MB">
   <!ENTITY elogind-buildsize     "47 MB">
   <!ENTITY elogind-time          "0.2 SBU">
@@ -144 +144 @@
 
 <screen role="root"><userinput>ninja install                                         &amp;&amp;
-ln -sv libelogind.pc /usr/lib/pkgconfig/libsystemd.pc &amp;&amp;
-ln -sv elogind /usr/include/systemd</userinput></screen>
+ln -sfv  libelogind.pc /usr/lib/pkgconfig/libsystemd.pc &amp;&amp;
+ln -sfvn elogind /usr/include/systemd</userinput></screen>
 
   </sect2>
@@ -177 +177 @@
       To automatically start <command>elogind</command> when the
       system is rebooted, install the
-      <filename>/etc/rc.d/init.d/elogind</filename> bootscript from the
+      <filename>/etc/rc.d/init.d/mountcgroupfs</filename> and
+      <filename>/etc/rc.d/init.d/elogind</filename> bootscripts from the
       <xref linkend="bootscripts"/> package.
     </para>

introduction/welcome/changelog.xml

@@ -72 +72 @@
         </listitem>
         <listitem revision="sysv">
-          <para>[dj] - Use proper elogind patch for dbus. Unnecessary after
-          241.1.</para>
+          <para>[dj] - Add --withsystemd{user,system}unitdir= switches to
+          prevent installation of systemd unit files.</para>
         </listitem>
         <listitem revision="sysv">
@@ -80 +80 @@
         </listitem>
         <listitem revision="sysv">
-          <para>[dj] - Add elogind-239.3. Adjust several packages to utilize
+          <para>[dj] - Fix build of polkit-0.115 with elogind.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[dj] - Add elogind-241.1. Adjust several packages to utilize
           elogind, and use systemd symlinks to provide libsystemd compatibility.          This will be incomplete until journald->syslog support is added in
           241.1. Will update temporary changelog at that time.</para>

packages.ent

@@ -274 +274 @@
 <!ENTITY cups-pk-helper-version       "0.2.6">
 <!ENTITY dbus-version                 "1.12.12">   <!-- Even minors only -->
-<!ENTITY elogind-version              "239.3">
+<!ENTITY elogind-version              "241.1">
 <!ENTITY eudev-version                "1.7">
 <!ENTITY fcron-version                "3.2.1">

postlfs/security/polkit.xml

@@ -79 +79 @@
           Required patch:
           <ulink url="&patch-root;/polkit-&polkit-version;-security_patch-3.patch"/>
-        </para>
-      </listitem>
-      <listitem revision="sysv">
-        <para>
-          Reecommended patch:
-          <ulink url="&patch-root;/polkit-&polkit-version;-elogind-1.patch"/>
         </para>
       </listitem>
@@ -186 +180 @@
 <screen><userinput>patch -Np1 -i ../polkit-&polkit-version;-security_patch-3.patch</userinput></screen>
 
-    <para revision="sysv">
-      Apply a patch to fix issues with elogind:
-    </para>
-
-<screen revision="sysv"><userinput>patch -Np1 -i ../polkit-0.115-elogind-1.patch &amp;&amp;
-autoreconf -fi</userinput></screen>
-
     <para>
       Install <application>Polkit</application> by running the following
@@ -201 +188 @@
             --sysconfdir=/etc                \
             --localstatedir=/var             \
-            --disable-static                 &amp;&amp;
+            --disable-static                 \
+            --enable-libelogind              \
+            --disable-libystemd-login        &amp;&amp;
 make</userinput></screen>
 

x/installing/xorg-server.xml

@@ -67 +67 @@
         <para>
           Estimated build time: &xorg-server-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact" revision="sysv">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-elogind-2.patch"/>
         </para>
       </listitem>
@@ -142 +132 @@
 <screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>-->
 
-    <para revision="sysv">
-      Apply a patch to add <application>elogind</application> support:
-    </para>
-
-<screen revision="sysv"><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-elogind-3.patch &amp;&amp;
-autoreconf -fi</userinput></screen>
-
     <para>
       Install the server by running the following commands:
@@ -186 +169 @@
     </para>
 
-    <para revision="sysv">
-      <parameter>--enable-install-setuid</parameter>: If not using
-      <xref linkend="elogind"/>, the Xorg binary must run
-      as the root user. This switch ensures that the binary is installed
-      setuid when <command>make</command> is run by an unprivileged user.
-    </para>
-
     <para>
       <parameter>--enable-suid-wrapper</parameter>: Build suid-root wrapper for
@@ -198 +174 @@
     </para>
 
-    <para revision="systemd">
+    <para>
       <option>--disable-systemd-logind --enable-install-setuid</option>:
-      These switches disable systemd-logind integration and restore the setuid
-      bit to the Xorg executable, allowing Xorg Server to work
-      without having the systemd PAM module installed and set up.
+      These switches disable <phrase revision="system">systemd-logind<phrase>
+      <phrase revision="sysv">elogind</phrase> integration and restore the
+      setuid bit to the Xorg executable, allowing Xorg Server to work
+      without having the <phrase revision="systemd">systemd</phrase>
+      <phrase revision="elogind">elogind</phrase> PAM module configured.
     </para>