Changeset 5b8f578d

Timestamp:

06/04/2016 05:00:39 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, 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:

e468571

Parents:

bb535118

Message:

[systemd-merge] - Chapter 12 layout

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

Files:

• general/sysutils/cups-pk-helper.xml (added)
• general/sysutils/initdtools.xml (modified) (1 diff)
• general/sysutils/modemmanager.xml (added)
• general/sysutils/strigi.xml (added)
• general/sysutils/sysutils.xml (modified) (3 diffs)
• general/sysutils/weston.xml (added)
• packages.ent (modified) (3 diffs)

general/sysutils/initdtools.xml

@@ -12 +12 @@
 ]>
 
-<sect1 id="initd-tools" xreflabel="Initd-tools-&initd-tools-version;">
+<sect1 id="initd-tools" xreflabel="Initd-tools-&initd-tools-version;" revision="sysv">
   <?dbhtml filename="initd-tools.html"?>
 

general/sysutils/sysutils.xml

@@ -26 +26 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-pk-helper.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
+
+  <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="initdtools.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lm_sensors.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logrotate.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mc.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modemmanager.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="obex-data-server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p7zip.xml"/>
@@ -43 +54 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="redland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sg3_utils.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strigi.xml"/> -->
+
+  <!-- systemd only -->  
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strigi.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
 
@@ -55 +69 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upower.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usbutils.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="weston.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zip.xml"/>

packages.ent

@@ -234 +234 @@
 <!ENTITY colord-version               "1.2.12">    <!-- Even minors only -->
 <!ENTITY cpio-version                 "2.12">
+<!ENTITY cups-pk-helper-version       "0.2.5">
 <!ENTITY dbus-version                 "1.10.8">   <!-- Even minors only -->
 <!ENTITY eudev-version                "1.7">
@@ -243 +244 @@
 <!ENTITY logrotate-version            "3.9.1">
 <!ENTITY mc-version                   "4.8.17">
+<!ENTITY ModemManager-version         "1.4.10">
 <!ENTITY obex-data-server-version     "0.4.6">
 <!ENTITY p7zip-version                "15.14.1">
@@ -261 +263 @@
 <!ENTITY upower-version               "0.99.4">
 <!ENTITY usbutils-version             "008">
+<!ENTITY weston-version               "1.8.0">
 <!ENTITY which-version                "2.21">
 <!ENTITY zip-version                  "3.0">