diff options
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter06/systemd.xml | 17 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 4 | ||||
| -rw-r--r-- | udev-lfs/Makefile.lfs | 2 |
5 files changed, 30 insertions, 9 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 92d79d934..99b8f7930 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,16 @@ --> <listitem> + <para>2012-11-28</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update makefile and instructions for + systemd-196/udev-lfs-196.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2012-11-27</para> <itemizedlist> <listitem> @@ -60,7 +70,7 @@ <para>2012-11-22</para> <itemizedlist> <listitem> - <para>[bdubbs] - Upgrade to systemd-196/lfs-udev-196. Fixes + <para>[bdubbs] - Upgrade to systemd-196/udev-lfs-196. Fixes <ulink url="&lfs-ticket-root;3233">#3233</ulink>.</para> </listitem> </itemizedlist> diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 0cd7fb16c..5bfa5d6db 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -59,11 +59,22 @@ <para>Compile the package:</para> -<screen><userinput remap="make">make -f udev-lfs-&systemd-version;/Makefile.lfs</userinput></screen> +<screen><userinput remap="make">make -f &udev-lfs;/Makefile.lfs</userinput></screen> <para>Install the package:</para> -<screen><userinput remap="install">make -f udev-lfs-&systemd-version;/Makefile.lfs install</userinput></screen> +<screen><userinput remap="install">make -f &udev-lfs;/Makefile.lfs install</userinput></screen> + + <caution><para>There are several places within the + <application>systemd</application> source code that have explicit directory + paths embedded. For instance, the binary version of the hardware + database's path and file name used at run time, + <filename>/etc/udev/hwdb.bin</filename>, cannot be changed without explict + changes to the source code.</para></caution> + + <para>Now initialize the hardware database:</para> + +<screen><userinput remap="install">build/udevadm hwdb --update</userinput></screen> <para>Finally set up the persistent network udev rules. This task will be explained in detail in <xref linkend='stable-net-names'/>. Note that the @@ -72,7 +83,7 @@ chroot environment as explained at the beginning of this chapter for the following script to work.</para> -<screen><userinput remap="install">bash udev-lfs-&systemd-version;/init-net-rules.sh</userinput></screen> +<screen><userinput remap="install">bash &udev-lfs;/init-net-rules.sh</userinput></screen> </sect2> <sect2 id="contents-udev" role="content"> diff --git a/general.ent b/general.ent index f4529363c..1bebfa091 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20121127"> -<!ENTITY releasedate "November 27, 2012"> +<!ENTITY version "SVN-20121128"> +<!ENTITY releasedate "November 28, 2012"> <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.3"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index fd455f62a..dd631361e 100644 --- a/packages.ent +++ b/packages.ent @@ -540,10 +540,10 @@ <!ENTITY tzdata-ch6-du "6.4 MB"> <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU"> -<!ENTITY udev-lfs "udev-lfs-&systemd-version;"> +<!ENTITY udev-lfs "udev-lfs-&systemd-version;-2"> <!ENTITY udev-lfs-size "20 KB"> <!ENTITY udev-lfs-url "&anduin-other;&udev-lfs;.tar.bz2"> -<!ENTITY udev-lfs-md5 "abfc9dad2075109ac9c08f40c6d2aae8"> +<!ENTITY udev-lfs-md5 "4021f31350f409a458e6f421041c62e4"> <!ENTITY udev-lfs-home " "> <!ENTITY util-linux-version "2.22.1"> diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs index bd4271098..76b3470df 100644 --- a/udev-lfs/Makefile.lfs +++ b/udev-lfs/Makefile.lfs @@ -290,7 +290,7 @@ install: udev # Set up hardware DB @mkdir -pv $(DESTDIR)/lib/udev/hwdb.d @cp hwdb/* $(DESTDIR)/lib/udev/hwdb.d - @build/udevadm hwdb --update + # @build/udevadm hwdb --update # Copy documentation @cp -v man/udev.7 $(DESTDIR)/usr/share/man/man7 |