Changeset 51dfb3e for x


Ignore:
Timestamp:
06/27/2019 08:55:17 PM (5 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.0, 9.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
ff3264f
Parents:
e77adf7
Message:

Move BLFS/trunk/BOOK and BLFS/trunk/bootscripts to
BLFS/branches/old-trunk-20190627 and BLFS/branches/old-bootscripts-20190627.

Move BLFS/branches/elogind-book and BLFS/branches/elogind-bootscripts
to trunk.

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

Location:
x
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • x/dm/lxdm.xml

    re77adf7 r51dfb3e  
    8686    <bridgehead renderas="sect4">Recommended</bridgehead>
    8787    <para role="recommended">
    88      <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
    89      <xref linkend="linux-pam"/>
     88     <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
     89     <xref linkend="polkit-gnome"/>
    9090    </para>
    9191
    … …  
    112112auth     requisite      pam_nologin.so
    113113auth     required       pam_env.so
     114auth     required       pam_succeed_if.so uid >= 1000 quiet
    114115auth     include        system-auth
    115116
    … …  
    302303<screen role="root"><userinput>cp -v /etc/inittab{,-orig} &amp;&amp;
    303304sed -i '/initdefault/ s/3/5/' /etc/inittab</userinput></screen>
     305
     306      <para>
     307          You should also disable default elogind power management:
     308      </para>
     309 
     310<screen role="root"><userinput>cat &gt;&gt; /etc/elogind/logind.conf &lt;&lt; "EOF"
     311<literal>AllowSuspend=no
     312AllowHibernation=no</literal>
     313EOF</userinput></screen>
    304314
    305315      <note>

  • x/installing/libinput.xml

    re77adf7 r51dfb3e  
    8888      <xref linkend="gtk3"/> (to build the GUI event viewer),
    8989      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink> (required for tests),
    90       <ulink revision="sysv" url="https://sourceforge.net/projects/linuxwacom/files/libwacom/">libwacom</ulink>
    91       <xref revision="systemd" linkend="libwacom"/>
    92       <!-- commas outside the rev get rendered on either version -->
    93       , and
     90      <xref linkend="libwacom"/>, and
    9491      <ulink url="https://pypi.org/project/pyparsing/">PyParsing</ulink> (for one non-root test)
    9592    </para>

  • x/installing/x7lib.xml

    re77adf7 r51dfb3e  
    155155      <xref linkend="fontconfig"/> and
    156156      <xref linkend="libxcb"/>
     157    </para>
     158
     159    <bridgehead renderas="sect4" revision="sysv">Recommended</bridgehead>
     160    <para role="recommended" revision="sysv">
     161      <xref linkend="elogind"/>
    157162    </para>
    158163

  • x/installing/xorg-config.xml

    re77adf7 r51dfb3e  
    268268
    269269<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/xkb-defaults.conf &lt;&lt; "EOF"
    270 Section "InputClass"
     270<literal>Section "InputClass"
    271271    Identifier "XKB Defaults"
    272272    MatchIsKeyboard "yes"
    273273    Option "XkbLayout" "fr"
    274274    Option "XkbOptions" "terminate:ctrl_alt_bksp"
    275 EndSection
     275EndSection</literal>
    276276EOF</userinput></screen>
    277277
    … …  
    294294
    295295<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/videocard-0.conf &lt;&lt; "EOF"
    296 Section "Device"
     296<literal>Section "Device"
    297297    Identifier  "Videocard0"
    298298    Driver      "radeon"
    … …  
    300300    BoardName   "ATI Radeon 7500"
    301301    Option      "NoAccel" "true"
    302 EndSection
     302EndSection</literal>
    303303EOF</userinput></screen>
    304304
    … …  
    310310
    311311<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/server-layout.conf &lt;&lt; "EOF"
    312 Section "ServerLayout"
     312<literal>Section "ServerLayout"
    313313    Identifier     "DefaultLayout"
    314314    Screen      0  "Screen0" 0 0
    315315    Screen      1  "Screen1" LeftOf "Screen0"
    316316    Option         "Xinerama"
    317 EndSection
     317EndSection</literal>
    318318EOF</userinput></screen>
    319319

  • x/installing/xorg-server.xml

    re77adf7 r51dfb3e  
    7070      </listitem>
    7171    </itemizedlist>
     72
    7273<!-- Prime support is now automatically added in DRI3, and this patch
    7374     may break things on some setups.
    … …  
    9293
    9394    <bridgehead renderas="sect4">Recommended</bridgehead>
    94     <para role="recommended" revision="sysv">
    95       <xref linkend="libepoxy"/> (required for glamor, see command
    96       explanations below)
    97     </para>
    98     <para role="recommended" revision="systemd">
     95    <para role="recommended">
    9996      <xref linkend="libepoxy"/> (needed for glamor and Xwayland),
    10097      <xref linkend="wayland"/> (needed for Xwayland),
    10198      <xref linkend="wayland-protocols"/>, and
    102       <xref linkend="systemd"/>
     99      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
     100      <phrase revision="systemd"><xref linkend="systemd"/></phrase>
    103101    </para>
    104102
    … …  
    115113      <xref linkend="xcb-util-wm"/> (all three to build Xephyr),
    116114      <xref linkend="xmlto"/> (to build documentation),
    117       <phrase revision="sysv"><xref linkend="wayland"/> (needed for Xwayland),
    118       <xref linkend="wayland-protocols"/>,</phrase>
    119115      <ulink url="http://download.savannah.gnu.org/releases/libunwind">libunwind</ulink>, and
    120116      <ulink url="https://www.x.org/archive/individual/doc/">xorg-sgml-doctools</ulink> (to build documentation)
    … …  
    140136    </para>
    141137
    142 <screen revision="sysv"><userinput>./configure $XORG_CONFIG            \
    143            --enable-glamor          \
    144            --enable-install-setuid  \
    145            --enable-suid-wrapper    \
    146            --disable-systemd-logind \
    147            --with-xkb-output=/var/lib/xkb &amp;&amp;
    148 make</userinput></screen>
    149 
    150 <screen revision="systemd"><userinput>./configure $XORG_CONFIG          \
    151             --enable-glamor       \
    152             --enable-suid-wrapper \
     138<screen><userinput>./configure $XORG_CONFIG            \
     139            --enable-glamor         \
     140            --enable-suid-wrapper   \
     141            --enable-install-setuid \
    153142            --with-xkb-output=/var/lib/xkb &amp;&amp;
    154143make</userinput></screen>
    … …  
    188177    </para>
    189178
    190     <para revision="sysv">
    191       <parameter>--enable-install-setuid</parameter>: The Xorg binary must run
    192       as the root user. This switch ensures that the binary is installed
    193       setuid when <command>make</command> is run by an unprivileged user.
    194     </para>
    195 
    196179    <para>
    197180      <parameter>--enable-suid-wrapper</parameter>: Build suid-root wrapper for
    … …  
    199182    </para>
    200183
    201     <para revision="sysv">
    202       <parameter>--disable-systemd-logind</parameter>: Do not build
    203       systemd-logind support, otherwise, an error (EE), logged in
    204       <filename>/var/log/Xorg.0.log</filename>, occurs when starting the X
    205       server.  Systemd is not supported by this (sysv) version of BLFS.
    206     </para>
    207 
    208     <para revision="systemd">
     184    <para>
    209185      <option>--disable-systemd-logind --enable-install-setuid</option>:
    210       These switches disable systemd-logind integration and restore the setuid
    211       bit to the Xorg executable, allowing Xorg Server to work
    212       without having the systemd PAM module installed and set up.
     186      These switches disable <phrase revision="systemd">systemd-logind</phrase>
     187      <phrase revision="sysv">elogind</phrase> integration and restore the
     188      setuid bit to the Xorg executable, allowing Xorg Server to work
     189      without having the <phrase revision="systemd">systemd</phrase>
     190      <phrase revision="elogind">elogind</phrase> PAM module configured.
    213191    </para>
    214192

  • x/installing/xorg7.xml

    re77adf7 r51dfb3e  
    125125
    126126<screen role="root"><userinput>cat &gt; /etc/profile.d/xorg.sh &lt;&lt; EOF
    127 XORG_PREFIX="$XORG_PREFIX"
     127<literal>XORG_PREFIX="$XORG_PREFIX"
    128128XORG_CONFIG="--prefix=\$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --disable-static"
    129 export XORG_PREFIX XORG_CONFIG
     129export XORG_PREFIX XORG_CONFIG</literal>
    130130EOF
    131131chmod 644 /etc/profile.d/xorg.sh</userinput></screen>
    … …  
    154154
    155155<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
    156 
     156<literal>
    157157pathappend $XORG_PREFIX/bin             PATH
    158158pathappend $XORG_PREFIX/lib/pkgconfig   PKG_CONFIG_PATH
    … …  
    165165ACLOCAL="aclocal -I $XORG_PREFIX/share/aclocal"
    166166
    167 export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH
     167export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH</literal>
    168168EOF</userinput></screen>
    169169

  • x/lib/clutter.xml

    re77adf7 r51dfb3e  
    9292
    9393    <bridgehead renderas="sect4">Recommended</bridgehead>
    94     <para role="recommended" revision="sysv">
    95       <xref linkend="gobject-introspection"/> and
    96       <xref linkend="gtk3"/>
    97     </para>
    98     <para role="recommended" revision="systemd">
     94    <para role="recommended">
    9995      <xref linkend="gobject-introspection"/>,
    10096      <xref linkend="gtk3"/>,
    … …  
    106102
    107103    <bridgehead renderas="sect4">Optional</bridgehead>
    108     <para role="optional" revision="sysv">
    109       <xref linkend="gtk-doc"/>,
    110       <xref linkend="libgudev"/>,
    111       <xref linkend="libinput"/>,
    112       <xref linkend="libxkbcommon"/>,
    113       <ulink url="https://github.com/kergoth/tslib">Tslib</ulink>, and
    114       <xref linkend="wayland"/>
    115     </para>
    116     <para role="optional" revision="systemd">
     104    <para role="optional">
    117105      <xref linkend="gtk-doc"/> and
    118106      <ulink url="https://github.com/kergoth/tslib">Tslib</ulink>
    … …  
    141129    </para>
    142130
    143 <screen revision="sysv"><userinput>./configure --prefix=/usr --sysconfdir=/etc --enable-egl-backend &amp;&amp;
    144 make</userinput></screen>
    145 
    146 <screen revision="systemd"><userinput>./configure --prefix=/usr               \
     131<screen><userinput>./configure --prefix=/usr               \
    147132            --sysconfdir=/etc           \
    148133            --enable-egl-backend        \
    … …  
    175160
    176161    <para>
    177       <parameter revision="systemd">--enable-evdev-input</parameter><option
    178       revision="sysv">--enable-evdev-input</option>: This switch enables
     162      <parameter>--enable-evdev-input</parameter>: This switch enables
    179163      the experimental Evdev input backend which is required for
    180164      <application>GNOME</application> Wayland support.
    … …  
    182166
    183167    <para>
    184       <parameter revision="systemd">--enable-wayland</parameter><option
    185       revision="sysv">--enable-wayland</option> and <parameter
    186       revision="systemd">--enable-wayland-compositor</parameter><option
    187       revision="sysv">--enable-wayland-compositor</option>: These switches
    188       enable the experimental <application>Wayland</application> API in
    189       <application>Clutter</application> which is required for
     168      <parameter>--enable-wayland</parameter> and
     169      <parameter>--enable-wayland-compositor</parameter>: These
     170      switches enable the experimental <application>Wayland</application> API
     171      in <application>Clutter</application> which is required for
    190172      <application>GNOME</application> Wayland support.
    191173    </para>

  • x/lib/cogl.xml

    re77adf7 r51dfb3e  
    8383      <xref linkend="gdk-pixbuf"/>,
    8484      <xref linkend="glu"/>,
    85       <xref linkend="mesa"/>,<phrase revision="sysv"> and</phrase>
    86       <xref linkend="pango"/><phrase revision="systemd">, and
    87       <xref linkend="wayland"/></phrase>
     85      <xref linkend="mesa"/>,
     86      <xref linkend="pango"/>, and
     87      <xref linkend="wayland"/>
    8888    </para>
    8989
    … …  
    9797      <xref linkend="gst10-plugins-base"/>,
    9898      <xref linkend="gtk-doc"/>,
    99       <xref linkend="sdl"/>,<phrase revision="systemd"> and</phrase>
    100       <xref linkend="sdl2"/><phrase revision="sysv">, and
    101       <xref linkend="wayland"/></phrase>
     99      <xref linkend="sdl"/>, and
     100      <xref linkend="sdl2"/>
    102101    </para>
    103102
    … …  
    125124    &parallel_issues;
    126125
    127 <screen revision="sysv"><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
    128 
    129 ./configure --prefix=/usr --enable-gles1 --enable-gles2         &amp;&amp;
    130 make</userinput></screen>
    131 
    132 <screen revision="systemd"><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
     126<screen><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
    133127
    134128./configure --prefix=/usr --enable-gles1 --enable-gles2         \
    … …  
    166160
    167161    <para>
    168       <phrase revision="sysv">
    169       <option>--enable-{kms,wayland,xlib}-egl-platform</option>:</phrase>
    170       <phrase revision="systemd">
    171       <parameter>--enable-{kms,wayland,xlib}-egl-platform</parameter>:</phrase>
     162      <parameter>--enable-{kms,wayland,xlib}-egl-platform</parameter>:
    172163      These switches enable support for KMS, Wayland and Xlib EGL platforms.
    173164      They are required for <application>GNOME</application> Wayland support.
    … …  
    175166
    176167    <para>
    177       <phrase revision="sysv">
    178       <option>--enable-wayland-egl-server</option>:</phrase>
    179       <phrase revision="systemd">     
    180       <parameter>--enable-wayland-egl-server</parameter>:</phrase> This switch
     168      <parameter>--enable-wayland-egl-server</parameter>: This switch
    181169      enables <application>Cogl</application>'s Wayland Server API which is
    182170      required for <application>GNOME</application> Wayland support.

  • x/lib/gtk+2.xml

    re77adf7 r51dfb3e  
    212212
    213213<screen><userinput>cat &gt; ~/.gtkrc-2.0 &lt;&lt; "EOF"
    214 include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
    215 gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"
     214<literal>include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
     215gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"</literal>
    216216EOF</userinput></screen>
    217217
    … …  
    229229
    230230<screen role="root"><userinput>cat &gt; /etc/gtk-2.0/gtkrc &lt;&lt; "EOF"
    231 include "/usr/share/themes/<replaceable>Clearlooks</replaceable>/gtk-2.0/gtkrc"
    232 gtk-icon-theme-name = "<replaceable>elementary</replaceable>"
     231<literal>include "/usr/share/themes/<replaceable>Clearlooks</replaceable>/gtk-2.0/gtkrc"
     232gtk-icon-theme-name = "<replaceable>elementary</replaceable>"</literal>
    233233EOF</userinput></screen>
    234234

  • x/lib/gtk+3.xml

    re77adf7 r51dfb3e  
    103103
    104104    <bridgehead renderas="sect4">Optional</bridgehead>
    105     <para role="optional" revision="sysv">
    106       <xref linkend="colord"/>,
    107       <xref linkend="cups"/>,
    108       <xref linkend="docbook-utils"/>,
    109       <xref linkend="gtk-doc"/>,
    110       <xref linkend="json-glib"/>,
    111       <ulink url="http://icl.cs.utk.edu/papi/">PAPI</ulink>, and
    112       <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/rest/">rest</ulink>
    113     </para>
    114     <para role="optional" revision="systemd">
     105    <para role="optional">
    115106      <xref linkend="colord"/>,
    116107      <xref linkend="cups"/>,

  • x/lib/gtk-vnc.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;" revision="systemd">
     15<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;">
    1616  <?dbhtml filename="gtk-vnc.html"?>
    1717
Note: See TracChangeset for help on using the changeset viewer.