Browse Source

Update to man-pages-3.5.9.

Incorporate beta FHS.
Add /usr/share/ppd, /usr/libexec, /usr/share/color,
/usr/local/share/color, /var/lib/color, and /usr/share/dict.

Remove overrides for /usr/libexec: coreutils, findutils, gawk,
gcc, glibc, inetutils, man-db, and tar.

Move grub sbin executables from /usr/sbin to /sbin.

Document two new glibc errors in the regression tests.

Move man-db after util-linux to satisfy a test dependency
in /tools and to speed the test up.

Restore building the flex static library.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10469 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Bruce Dubbs 11 years ago
parent
commit
d02c56d5f5

+ 1 - 1
appendices/dependencies.xml

@@ -1384,7 +1384,7 @@
         <segtitle>&testsuites;</segtitle>
         <segtitle>&testsuites;</segtitle>
 
 
         <seglistitem>
         <seglistitem>
-          <seg>Not run. Requires Man-DB test suite package</seg>
+          <seg>Util-linux</seg>
         </seglistitem>
         </seglistitem>
       </segmentedlist>
       </segmentedlist>
 
 

+ 45 - 0
chapter01/changelog.xml

@@ -35,6 +35,51 @@
       </itemizedlist>
       </itemizedlist>
     </listitem>
     </listitem>
 -->
 -->
+    <listitem>
+      <para>2014-02-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.5.9.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Incorporate beta FHS.  Add 
+          /usr/share/ppd, /usr/libexec, /usr/share/color, 
+          /usr/local/share/color, /var/lib/color, and /usr/share/dict. 
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Incorporate beta FHS.  Remove overrides
+          for /usr/libexec: coreutils, findutils, gawk, gcc, glibc, 
+          inetutils, man-db, and tar.  Also fixes 
+          <ulink url="&lfs-ticket-root;3498">#3498</ulink>.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Incorporate beta FHS.  Move grub sbin
+          executables from /usr/sbin to /sbin.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Document two new glibc errors in the
+          regression tests.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Move man-db after util-linux to satisfy
+          a test dependency.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update automake tests to accomodate util-linux
+          in /tools and to speed the test up.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Restore building the flex static library.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
     <listitem>
     <listitem>
       <para>2014-02-14</para>
       <para>2014-02-14</para>
       <itemizedlist>
       <itemizedlist>

+ 11 - 5
chapter06/automake.xml

@@ -49,11 +49,17 @@
 
 
 <screen><userinput remap="make">make</userinput></screen>
 <screen><userinput remap="make">make</userinput></screen>
 
 
-    <note><para>The tests take a very long time: over 30 SBUs.</para></note>
-
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
+    <para>There are a couple of tests that incorrectly link to the 
+    wrong version of the flex library, so we temporarily work around
+    the problem.  Also, using the -j4 make option speeds up the tests, even on
+    systems with only one processor due to internal delays in individual
+    tests.  To test the results, issue:</para>
+
+<screen><userinput remap="test">mv -v /usr/lib/libfl.{so,save}
+ln -sv libfl.a /usr/lib/libfl.so
+make -j4 check
+rm -v /usr/lib/libfl.so
+mv -v /usr/lib/libfl.{save,so}</userinput></screen>
 
 
     <para>Install the package:</para>
     <para>Install the package:</para>
 
 

+ 1 - 1
chapter06/chapter06.xml

@@ -65,7 +65,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
@@ -73,6 +72,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>

+ 0 - 1
chapter06/coreutils.xml

@@ -61,7 +61,6 @@
 
 
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure \
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure \
             --prefix=/usr            \
             --prefix=/usr            \
-            --libexecdir=/usr/lib    \
             --enable-no-install-program=kill,uptime</userinput></screen>
             --enable-no-install-program=kill,uptime</userinput></screen>
 
 
     <variablelist>
     <variablelist>

+ 2 - 2
chapter06/creatingdirs.xml

@@ -18,7 +18,7 @@ mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
 install -dv -m 0750 /root
 install -dv -m 0750 /root
 install -dv -m 1777 /tmp /var/tmp
 install -dv -m 1777 /tmp /var/tmp
 mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
 mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
+mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
 mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -pv /usr/{,local/}share/man/man{1..8}
 mkdir -pv /usr/{,local/}share/man/man{1..8}
 for dir in /usr /usr/local; do
 for dir in /usr /usr/local; do
@@ -30,7 +30,7 @@ esac
 mkdir -v /var/{log,mail,spool}
 mkdir -v /var/{log,mail,spool}
 ln -sv /run /var/run
 ln -sv /run /var/run
 ln -sv /run/lock /var/lock
 ln -sv /run/lock /var/lock
-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}</userinput></screen>
+mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput></screen>
 
 
   <para>Directories are, by default, created with permission mode 755, but
   <para>Directories are, by default, created with permission mode 755, but
   this is not desirable for all directories. In the commands above, two
   this is not desirable for all directories. In the commands above, two

+ 0 - 1
chapter06/findutils.xml

@@ -46,7 +46,6 @@
     <para>Prepare Findutils for compilation:</para>
     <para>Prepare Findutils for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr                   \
 <screen><userinput remap="configure">./configure --prefix=/usr                   \
-            --libexecdir=/usr/lib/findutils \
             --localstatedir=/var/lib/locate</userinput></screen>
             --localstatedir=/var/lib/locate</userinput></screen>
 
 
     <variablelist>
     <variablelist>

+ 2 - 3
chapter06/flex.xml

@@ -48,7 +48,6 @@
     <para>Prepare Flex for compilation:</para>
     <para>Prepare Flex for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
 <screen><userinput remap="configure">./configure --prefix=/usr    \
-            --disable-static \
             --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
             --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
 
     <para>Compile the package:</para>
     <para>Compile the package:</para>
@@ -98,7 +97,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
 
 
       <seglistitem>
       <seglistitem>
         <seg>flex, flex++ (link to flex), and lex</seg>
         <seg>flex, flex++ (link to flex), and lex</seg>
-        <seg>libfl.so and libfl_pic.so</seg>
+        <seg>libfl.{so,a} and libfl_pic.{so.a}</seg>
         <seg>/usr/share/doc/flex-&flex-version;</seg>
         <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
       </seglistitem>
     </segmentedlist>
     </segmentedlist>
@@ -143,7 +142,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
       </varlistentry>
       </varlistentry>
 
 
       <varlistentry id="libfl.so">
       <varlistentry id="libfl.so">
-        <term><filename class="libraryfile">libfl.a</filename></term>
+        <term><filename class="libraryfile">libfl.so</filename></term>
         <listitem>
         <listitem>
           <para>The <filename class="libraryfile">flex</filename> library</para>
           <para>The <filename class="libraryfile">flex</filename> library</para>
           <indexterm zone="ch-system-flex libfl.so">
           <indexterm zone="ch-system-flex libfl.so">

+ 1 - 1
chapter06/gawk.xml

@@ -42,7 +42,7 @@
 
 
     <para>Prepare Gawk for compilation:</para>
     <para>Prepare Gawk for compilation:</para>
 
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
 
     <para>Compile the package:</para>
     <para>Compile the package:</para>
 
 

+ 0 - 1
chapter06/gcc.xml

@@ -72,7 +72,6 @@ cd ../gcc-build</userinput></screen>
 
 
 <screen><userinput remap="configure">SED=sed                                            \
 <screen><userinput remap="configure">SED=sed                                            \
 ../gcc-&gcc-version;/configure --prefix=/usr               \
 ../gcc-&gcc-version;/configure --prefix=/usr               \
-                       --libexecdir=/usr/lib       \
                        --enable-shared             \
                        --enable-shared             \
                        --enable-threads=posix      \
                        --enable-threads=posix      \
                        --enable-__cxa_atexit       \
                        --enable-__cxa_atexit       \

+ 7 - 11
chapter06/glibc.xml

@@ -77,21 +77,11 @@ cd ../glibc-build</userinput></screen>
     --prefix=/usr                \
     --prefix=/usr                \
     --disable-profile            \
     --disable-profile            \
     --enable-kernel=&min-kernel;       \
     --enable-kernel=&min-kernel;       \
-    --libexecdir=/usr/lib/glibc  \
     --enable-obsolete-rpc</userinput></screen>
     --enable-obsolete-rpc</userinput></screen>
 
 
     <variablelist>
     <variablelist>
       <title>The meaning of the new configure options:</title>
       <title>The meaning of the new configure options:</title>
 
 
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of some auxillary files from the
-          default of <filename class="directory">/usr/libexec</filename> to
-          <filename class="directory">/usr/lib/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
       <varlistentry>
         <term><parameter>--enable-obsolete-rpc</parameter></term>
         <term><parameter>--enable-obsolete-rpc</parameter></term>
         <listitem>
         <listitem>
@@ -155,9 +145,15 @@ grep Error glibc-check-log</userinput></screen>
         connection when the test is run.</para>
         connection when the test is run.</para>
       </listitem>
       </listitem>
 
 
+      <listitem>
+        <para>libio/tst-ftell-partial-wide.out fails because it needs a locale
+        that has not yet been generated.</para>
+      </listitem>
+
       <listitem>
       <listitem>
         <para>Other tests known to fail on some architectures are posix/bug-regex32,
         <para>Other tests known to fail on some architectures are posix/bug-regex32,
-        misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, and stdio-common/bug22.</para>
+        misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, nptl/tst-robust8,
+        and stdio-common/bug22.</para>
       </listitem>
       </listitem>
 
 
     </itemizedlist>
     </itemizedlist>

+ 1 - 0
chapter06/grub.xml

@@ -47,6 +47,7 @@
     <para>Prepare GRUB for compilation:</para>
     <para>Prepare GRUB for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr          \
 <screen><userinput remap="configure">./configure --prefix=/usr          \
+            --sbindir=/sbin        \
             --sysconfdir=/etc      \
             --sysconfdir=/etc      \
             --disable-grub-emu-usb \
             --disable-grub-emu-usb \
             --disable-efiemu       \
             --disable-efiemu       \

+ 0 - 1
chapter06/inetutils.xml

@@ -48,7 +48,6 @@
     <para>Prepare Inetutils for compilation:</para>
     <para>Prepare Inetutils for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr  \
 <screen><userinput remap="configure">./configure --prefix=/usr  \
-    --libexecdir=/usr/sbin \
     --localstatedir=/var   \
     --localstatedir=/var   \
     --disable-logger       \
     --disable-logger       \
     --disable-syslogd      \
     --disable-syslogd      \

+ 0 - 1
chapter06/man-db.xml

@@ -44,7 +44,6 @@
     <para>Prepare Man-DB for compilation:</para>
     <para>Prepare Man-DB for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr                        \
 <screen><userinput remap="configure">./configure --prefix=/usr                        \
-            --libexecdir=/usr/lib                \
             --docdir=/usr/share/doc/man-db-&man-db-version; \
             --docdir=/usr/share/doc/man-db-&man-db-version; \
             --sysconfdir=/etc                    \
             --sysconfdir=/etc                    \
             --disable-setuid                     \
             --disable-setuid                     \

+ 1 - 2
chapter06/tar.xml

@@ -48,8 +48,7 @@
 
 
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1  \
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1  \
 ./configure --prefix=/usr \
 ./configure --prefix=/usr \
-            --bindir=/bin \
-            --libexecdir=/usr/sbin</userinput></screen>
+            --bindir=/bin</userinput></screen>
 
 
     <variablelist>
     <variablelist>
       <title>The meaning of the configure options:</title>
       <title>The meaning of the configure options:</title>

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version         "SVN-20140214">
-<!ENTITY releasedate     "February 14, 2014">
+<!ENTITY version         "SVN-20140216">
+<!ENTITY releasedate     "February 16, 2015">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 6 - 6
packages.ent

@@ -22,7 +22,7 @@
 <!ENTITY automake-md5 "7fc29854c520f56b07aa232a0f880292">
 <!ENTITY automake-md5 "7fc29854c520f56b07aa232a0f880292">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "100 MB">
 <!ENTITY automake-ch6-du "100 MB">
-<!ENTITY automake-ch6-sbu "less than 0.1 SBU (34.1 SBU with tests)">
+<!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 12 SBU with tests)">
 
 
 <!ENTITY bash-version "4.2">
 <!ENTITY bash-version "4.2">
 <!ENTITY bash-size "6,845 KB">
 <!ENTITY bash-size "6,845 KB">
@@ -385,10 +385,10 @@
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
 
-<!ENTITY man-pages-version "3.58">
-<!ENTITY man-pages-size "1,170 KB">
+<!ENTITY man-pages-version "3.59">
+<!ENTITY man-pages-size "1,172 KB">
 <!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
 <!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "539698a70e0338551d22c24011c03186">
+<!ENTITY man-pages-md5 "d8e4d8287a76ee861351b905044c8e92">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "23 MB">
 <!ENTITY man-pages-ch6-du "23 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -554,10 +554,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
 
-<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-2">
+<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-3">
 <!ENTITY udev-lfs-size   "29 KB">
 <!ENTITY udev-lfs-size   "29 KB">
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
-<!ENTITY udev-lfs-md5    "ed85205909de6e4f96ea2b0ebc57df7e">
+<!ENTITY udev-lfs-md5    "c0231ff619e567a9b11f912d8a7a404a">
 <!ENTITY udev-lfs-home   " ">
 <!ENTITY udev-lfs-home   " ">
 
 
 <!ENTITY util-linux-version "2.24.1">
 <!ENTITY util-linux-version "2.24.1">

+ 3 - 2
prologue/standards.xml

@@ -22,8 +22,9 @@
         POSIX.1-2008</ulink>.</para>
         POSIX.1-2008</ulink>.</para>
       </listitem>
       </listitem>
       <listitem>
       <listitem>
-        <para><ulink url="http://www.pathname.com/fhs/pub/fhs-2.3.html">Filesystem
-        Hierarchy Standard (FHS)</ulink></para>
+        <para><ulink 
+        url="http://www.linuxfoundation.org/collaborate/workgroups/lsb/fhs-30-draft-1">
+        Filesystem Hierarchy Standard version 3.0 Draft 1 (FHS)</ulink></para>
 
 
       </listitem>
       </listitem>
       <listitem>
       <listitem>

+ 4 - 0
udev-lfs/ChangeLog

@@ -1,3 +1,7 @@
+2014-02-16  <bdubbs@linuxfromscratch.org>
+   * Makefile.lfs: Adjust warning flags.  Adjust linking rules to
+     allow build with util-linux in LFS's /tools directory.
+
 2010-01-26	Matt Burgess <matthew@linuxfromscratch.org>
 2010-01-26	Matt Burgess <matthew@linuxfromscratch.org>
 	* 55-lfs.rules: Remove lots of rules that have been merged upstream.
 	* 55-lfs.rules: Remove lots of rules that have been merged upstream.
 	* 61-cdrom.rules: Remove as upstream has a replacement.
 	* 61-cdrom.rules: Remove as upstream has a replacement.

+ 4 - 5
udev-lfs/Makefile.lfs

@@ -5,7 +5,7 @@
 
 
 SHELL=/bin/bash
 SHELL=/bin/bash
 SYSTEMD_VERSION=208
 SYSTEMD_VERSION=208
-VERSION=$(SYSTEMD_VERSION)-1
+VERSION=$(SYSTEMD_VERSION)-3
 
 
 ifeq ($(V),)
 ifeq ($(V),)
  VB = @
  VB = @
@@ -21,7 +21,7 @@ WARN = -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 \
 -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align \
 -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align \
 -Wstrict-aliasing=2 -Wwrite-strings -Wno-overlength-strings \
 -Wstrict-aliasing=2 -Wwrite-strings -Wno-overlength-strings \
 -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result \
 -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result \
--Werror=overflow -Wp,-D_FORTIFY_SOURCE=2 -Wno-long-long 
+-Werror=overflow -Wp,-D_FORTIFY_SOURCE=2 -Wno-long-long -Wno-vla
 
 
 OPTIONS = -O2 -pipe -ffast-math -fno-common -fdiagnostics-show-option \
 OPTIONS = -O2 -pipe -ffast-math -fno-common -fdiagnostics-show-option \
 -fno-strict-aliasing -ffunction-sections -fdata-sections -fPIC -std=gnu99
 -fno-strict-aliasing -ffunction-sections -fdata-sections -fPIC -std=gnu99
@@ -29,7 +29,7 @@ OPTIONS = -O2 -pipe -ffast-math -fno-common -fdiagnostics-show-option \
 OPTIONS2 := $(OPTIONS) -fvisibility=hidden
 OPTIONS2 := $(OPTIONS) -fvisibility=hidden
 
 
 LDFLAGS1  = -pthread -lrt -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined 
 LDFLAGS1  = -pthread -lrt -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined 
-LDFLAGS2 := $(LDFLAGS1) -lblkid -lkmod 
+LDFLAGS2 := $(LDFLAGS1) -L /tools/lib -lblkid -lkmod 
 
 
 DEF = -include cfg.h                    \
 DEF = -include cfg.h                    \
       -DSYSCONFDIR=\"/etc\"             \
       -DSYSCONFDIR=\"/etc\"             \
@@ -42,7 +42,7 @@ DEF = -include cfg.h                    \
       -DHAVE_FIRMWARE
       -DHAVE_FIRMWARE
 
 
 INCLUDE = -I src/libudev -I src/shared -I src -I src/login -I src/systemd \
 INCLUDE = -I src/libudev -I src/shared -I src -I src/login -I src/systemd \
-          -I src/core    -I udev-lfs-$(SYSTEMD_VERSION)-1
+          -I src/core    -I udev-lfs-$(VERSION)
 
 
 LIBUDEV_SRCS = libudev-device-private.c \
 LIBUDEV_SRCS = libudev-device-private.c \
                libudev-device.c         \
                libudev-device.c         \
@@ -152,7 +152,6 @@ VPATH = src/login          src/udev          src/udev/accelerometer \
 SED_PROCESS = \
 SED_PROCESS = \
   sed  -e 's|@VERSION@|$(SYSTEMD_VERSION)|g'       \
   sed  -e 's|@VERSION@|$(SYSTEMD_VERSION)|g'       \
        -e 's|@prefix@|/usr|g'              \
        -e 's|@prefix@|/usr|g'              \
-       -e 's|@exec_prefix@|/usr|g'         \
        -e 's|@udevlibexecdir@|/lib/udev|g' \
        -e 's|@udevlibexecdir@|/lib/udev|g' \
        -e 's|@libdir@|/usr/lib|g'          \
        -e 's|@libdir@|/usr/lib|g'          \
        -e 's|@includedir@|/usr/include|g'  \
        -e 's|@includedir@|/usr/include|g'  \