diff options
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter06/createfiles.xml | 8 | ||||
| -rw-r--r-- | chapter06/systemd.xml | 62 | ||||
| -rw-r--r-- | chapter06/util-linux.xml | 4 | ||||
| -rw-r--r-- | general.ent | 6 |
5 files changed, 46 insertions, 45 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 5985e2078..aee953990 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,17 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem revision="systemd"> + <para>2017-11-09</para> + <itemizedlist> + <listitem> + <para>[dj] - Create additional symlinks to simplify build of systemd + and remove text references to + <filename class="directory">/tools/include</filename>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem revision="systemd"> <para>2017-11-08</para> <itemizedlist> <listitem> diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 23da2d1e3..1287b4efb 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -56,6 +56,14 @@ do ln -sv /tools/lib/lib$lib.so* /usr/lib sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la done +ln -svf /tools/include/blkid /usr/include +ln -svf /tools/include/libmount /usr/include +ln -svf /tools/include/uuid /usr/include +for pc in blkid mount uuid +do + sed 's@tools@usr@g' /tools/lib/pkgconfig/${pc}.pc \ + > /usr/lib/pkgconfig/${pc}.pc +done ln -sv bash /bin/sh</userinput></screen> <variablelist> diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 84a66466e..923b7a36f 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -46,29 +46,26 @@ <para>Prepare systemd for compilation:</para> -<screen><userinput remap="configure">PKG_CONFIG_PATH=/usr/lib/pkgconfig:/tools/lib/pkgconfig \ -LANG=en_US.UTF-8 \ - meson --prefix /usr \ - --sysconfdir /etc \ - --localstatedir /var \ - -Dblkid=true \ - -Dbuildtype=release \ - -Ddefault-dnssec=no \ - -Dfirstboot=false \ - -Dkill-path=/bin/kill \ - -Dkmod-path=/bin/kmod \ - -Dldconfig=false \ - -Dmount-path=/bin/mount \ - -Drootprefix= \ - -Drootlibdir=/lib \ - -Dsplit-usr=true \ - -Dsulogin-path=/sbin/sulogin \ - -Dsysusers=false \ - -Dumount-path=/bin/umount \ - -Db_lto=false \ - -Dc_link_args="-lblkid -lmount" \ - -Dc_args="-I/tools/include/blkid -I/tools/include/libmount" \ - $PWD build</userinput></screen> + <screen><userinput remap="configure"> +LANG=en_US.UTF-8 meson --prefix=/usr \ + --sysconfdir /etc \ + --localstatedir /var \ + -Dblkid=true \ + -Dbuildtype=release \ + -Ddefault-dnssec=no \ + -Dfirstboot=false \ + -Dkill-path=/bin/kill \ + -Dkmod-path=/bin/kmod \ + -Dldconfig=false \ + -Dmount-path=/bin/mount \ + -Drootprefix= \ + -Drootlibdir=/lib \ + -Dsplit-usr=true \ + -Dsulogin-path=/sbin/sulogin \ + -Dsysusers=false \ + -Dumount-path=/bin/umount \ + -Db_lto=false \ + $PWD build</userinput></screen> <variablelist> <title>The meaning of the meson options:</title> @@ -140,25 +137,6 @@ LANG=en_US.UTF-8 \ </listitem> </varlistentry> - <varlistentry> - <term><parameter>-Dc_link_args="-lblkid -lmount"</parameter></term> - <listitem> - <para>This switch manually adds libblkid and libmount to the - linker flags as they only exist in <filename>/tools/lib</filename> - until <application>Util-Linux</application> is installed later in - this chapter.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><parameter>-Dc_args="-I/tools/include/blkid -I/tools/include/libmount"</parameter></term> - <listitem> - <para>This switch manually adds the include paths for libblkid and - libmount to the CFLAGS variable as the packages are not yet installed - in the final system.</para> - </listitem> - </varlistentry> - </variablelist> <para>Compile the package:</para> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 7b90ab845..1a78af502 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -60,6 +60,10 @@ <screen><userinput remap="pre">sed -e 's/2^64/(2^64/' -e 's/E </E) <=/' -e 's/ne /eq /' \ -i tests/ts/ipcs/limits2</userinput></screen> --> + <para revision="systemd">Remove the earlier created symlinks:</para> + +<screen revision="systemd"><userinput remap="pre">rm -vf /usr/include/{blkid,libmount,uuid}</userinput></screen> + <para>Prepare Util-linux for compilation:</para> <screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ diff --git a/general.ent b/general.ent index e3caa9c8c..6387a7fea 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20171106"> +<!ENTITY version "SVN-20171109"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; Change to x.y for release but not -rc releases --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> -<!ENTITY versiond "20171108-systemd"> +<!ENTITY versiond "20171109-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "November 6, 2017"> +<!ENTITY releasedate "November 9, 2017"> <!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "8.2"> |