From 58c8823a5328210c329129f3efbe175723f8466b Mon Sep 17 00:00:00 2001 From: Krejzi Date: Tue, 18 Feb 2014 02:24:31 +0000 Subject: [PATCH] Random fixes. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10478 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/xz.xml | 2 +- chapter06/acl.xml | 24 ++++++++++++------------ chapter06/attr.xml | 11 +++++------ chapter06/createfiles.xml | 5 +---- chapter06/dbus.xml | 20 +++++++++----------- chapter06/expat.xml | 2 +- chapter06/findutils.xml | 3 +-- chapter06/flex.xml | 13 ++++++------- chapter06/gdbm.xml | 2 +- chapter06/gettext.xml | 3 +-- chapter06/glibc.xml | 8 ++++---- chapter06/gperf.xml | 3 +-- chapter06/intltool.xml | 3 +-- chapter06/libcap.xml | 6 +++--- chapter06/mpfr.xml | 6 +++--- chapter06/systemd.xml | 25 ++++++++++++++++--------- chapter06/xz.xml | 3 +-- 17 files changed, 67 insertions(+), 72 deletions(-) diff --git a/chapter05/xz.xml b/chapter05/xz.xml index 45be49fb6..bb3bc1a74 100644 --- a/chapter05/xz.xml +++ b/chapter05/xz.xml @@ -41,7 +41,7 @@ - Installation of Xz-Utils + Installation of Xz Prepare Xz for compilation: diff --git a/chapter06/acl.xml b/chapter06/acl.xml index 32a45409b..6f3328c3c 100644 --- a/chapter06/acl.xml +++ b/chapter06/acl.xml @@ -47,23 +47,23 @@ sed -i -e 's|/@pkg_name@|&-@pkg_version@|' include/builddefs.in + Fix some broken tests: + +sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test + Prepare Acl for compilation: -./configure --prefix=/usr --libexecdir=/usr/lib +./configure --prefix=/usr Compile the package: make The Acl tests need to be run on a filesystem that supports access - controls. You will see lot of failures because Coreutils wasn't compiled - with ACL support. To anyways test the results, issue: + controls. Coreutils needs to be compiled with ACL support in order for + the testsuite to complete sucessfully. To test the results, issue: -make -k tests root-tests - - Even if you run Acl tests after Coreutils has been built with - Acl support, at least 11 tests will still fail for unknown reasons. - +make tests Install the package: @@ -76,7 +76,7 @@ chmod -v 755 /usr/lib/libacl.so /usr/lib will need to be recreated: mv -v /usr/lib/libacl.so.* /lib -ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so +ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so @@ -90,7 +90,7 @@ ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so chacl, getfacl, and setacl - libacl.{so,a} + libacl.{a,so} /usr/include/acl, /usr/share/doc/acl-&acl-version; @@ -132,11 +132,11 @@ ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so - libacl.{so,a} + libacl Contains the Acl API functions. - libacl.{so,a} + libacl diff --git a/chapter06/attr.xml b/chapter06/attr.xml index 572f7635e..6d1fdad45 100644 --- a/chapter06/attr.xml +++ b/chapter06/attr.xml @@ -62,8 +62,7 @@ The Attr tests need to be run on a filesystem that supports extended attributes. To test the results, issue: - -make -k tests root-tests +make tests root-tests Install the package: @@ -76,7 +75,7 @@ chmod -v 755 /usr/lib/libattr.so /usr/lib will need to be recreated: mv -v /usr/lib/libattr.so.* /lib -ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so +ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so @@ -90,7 +89,7 @@ ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so attr, getfattr, and setattr - libattr.{so,a} + libattr.{a,so} /usr/include/attr, /usr/share/doc/attr-&attr-version; @@ -131,11 +130,11 @@ ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so - libattr.{so,a} + libattr Contains the Attr API functions. - libattr.{so,a} + libattr diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index ce20549e5..95217ad32 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -66,7 +66,6 @@ ln -sv bash /bin/sh cat > /etc/passwd << "EOF" root:x:0:0:root:/root:/bin/bash bin:x:1:1:bin:/dev/null:/bin/false -daemon:x:6:6:daemon:/dev/null:/bin/false messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false nobody:x:99:99:Unprivileged User:/dev/null:/bin/false EOF @@ -84,7 +83,6 @@ sys:x:2: kmem:x:3: tape:x:4: tty:x:5: -daemon:x:6: floppy:x:7: disk:x:8: lp:x:9: @@ -98,8 +96,7 @@ adm:x:16: messagebus:x:18: systemd-journal:x:23: mail:x:34: -nogroup:x:99: -users:x:100: +nogroup:x:99: EOF The created groups are not part of any standard—they are groups diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml index 07bd26a32..6a2f1d7ce 100644 --- a/chapter06/dbus.xml +++ b/chapter06/dbus.xml @@ -48,15 +48,11 @@ Prepare D-Bus for compilation: -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 \ - --disable-static \ - --enable-systemd \ +./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ --docdir=/usr/share/doc/dbus-&dbus-version; \ - --with-console-auth-dir=/run/console/ \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-console-auth-dir=/run/console/ The meaning of the configure options: @@ -84,7 +80,9 @@ make This package does come with a testsuite, but it requires several - packages that are not included in LFS. + packages that are not included in LFS. Instructions for running the + testsuite can be found in the BLFS book at + . Install the package: @@ -116,7 +114,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor, dbus-send, and dbus-uuidgen - libdbus-1.so + libdbus-1.{a,so} /etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0, /usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version;, /var/lib/dbus @@ -190,7 +188,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so - libdbus-1.so + libdbus-1 Contains API functions used to communicate with the D-Bus message bus. diff --git a/chapter06/expat.xml b/chapter06/expat.xml index 0ed85ac41..6e3fefa60 100644 --- a/chapter06/expat.xml +++ b/chapter06/expat.xml @@ -74,7 +74,7 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version; xmlwf - libexpat.{so,a} + libexpat.{a,so} /usr/share/doc/expat-&expat-version; diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index c04beab46..dff13b255 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -45,8 +45,7 @@ Prepare Findutils for compilation: -./configure --prefix=/usr \ - --localstatedir=/var/lib/locate +./configure --prefix=/usr --localstatedir=/var/lib/locate The meaning of the configure options: diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 6b4d42363..28d50e9a9 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -47,8 +47,7 @@ Prepare Flex for compilation: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/flex-&flex-version; +./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version; Compile the package: @@ -97,7 +96,7 @@ chmod -v 755 /usr/bin/lex flex, flex++ (link to flex), and lex - libfl.{so,a} and libfl_pic.{so.a} + libfl.{a,so} and libfl_pic.{a,so} /usr/share/doc/flex-&flex-version; @@ -141,12 +140,12 @@ chmod -v 755 /usr/bin/lex - - libfl.so + + libfl The flex library - - libfl.so + + libfl diff --git a/chapter06/gdbm.xml b/chapter06/gdbm.xml index f0e34616d..051207671 100644 --- a/chapter06/gdbm.xml +++ b/chapter06/gdbm.xml @@ -83,7 +83,7 @@ testgdbm - libgdbm.{so,a} and libgdbm_compat.{so,a} + libgdbm.{a,so} and libgdbm_compat.{a,so} diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index 684cd3060..8c64a5059 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -45,8 +45,7 @@ Prepare Gettext for compilation: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/gettext-&gettext-version; +./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version; Compile the package: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 58105b854..d01d99094 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -81,9 +81,9 @@ cd ../glibc-build Prepare Glibc for compilation: ../glibc-&glibc-version;/configure \ - --prefix=/usr \ - --disable-profile \ - --enable-kernel=&min-kernel; \ + --prefix=/usr \ + --disable-profile \ + --enable-kernel=&min-kernel; \ --enable-obsolete-rpc @@ -183,7 +183,7 @@ mkdir -pv /var/cache/nscd Install the Systemd support files for nscd: -install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /etc/tmpfiles.d/nscd.conf +install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.service /lib/systemd/system/nscd.service The locales that can make the system respond in a different language diff --git a/chapter06/gperf.xml b/chapter06/gperf.xml index 341d74d8d..92dd637c7 100644 --- a/chapter06/gperf.xml +++ b/chapter06/gperf.xml @@ -42,8 +42,7 @@ Prepare Gperf for compilation: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/gperf-&gperf-version; +./configure --prefix=/usr --docdir=/usr/share/doc/gperf-&gperf-version; Compile the package: diff --git a/chapter06/intltool.xml b/chapter06/intltool.xml index f8ae439ea..4eea82d0b 100644 --- a/chapter06/intltool.xml +++ b/chapter06/intltool.xml @@ -56,8 +56,7 @@ Install the package: make install -install -v -Dm644 doc/I18N-HOWTO \ - /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO +install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml index df04bc761..63e9d0017 100644 --- a/chapter06/libcap.xml +++ b/chapter06/libcap.xml @@ -60,7 +60,7 @@ chmod -v 755 /usr/lib/libcap.so /usr/lib will need to be recreated: mv -v /usr/lib/libcap.so.* /lib -ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so +ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so @@ -73,7 +73,7 @@ ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so capsh, getcap, getpcaps, and setcap - libcap.{so,a} + libcap.{a,so} @@ -113,7 +113,7 @@ ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so - libcap.{so,a} + libcap Contains the libcap API functions diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml index 00bb8e164..708101891 100644 --- a/chapter06/mpfr.xml +++ b/chapter06/mpfr.xml @@ -43,9 +43,9 @@ Prepare MPFR for compilation: -./configure --prefix=/usr \ - --enable-thread-safe \ - --docdir=/usr/share/doc/mpfr-&mpfr-version; +./configure --prefix=/usr \ + --enable-thread-safe \ + --docdir=/usr/share/doc/mpfr-&mpfr-version; Compile the package: diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 628954fae..4fd5e209f 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -57,16 +57,15 @@ EOF Prepare Systemd for compilation: -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ +./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ --docdir=/usr/share/doc/systemd-&systemd-version; \ - --config-cache \ - --with-rootprefix= \ - --with-rootlibdir=/lib \ - --enable-split-usr \ - --disable-gudev \ + --config-cache \ + --with-rootprefix= \ + --with-rootlibdir=/lib \ + --enable-split-usr \ + --disable-gudev \ --without-python @@ -116,6 +115,14 @@ EOF The package comes with a testsuite, but it doesn't work in chroot. It needs to be run from a system booted using Systemd. + First prevent a broken test case from running: + +sed -i s:test/udev-test.pl::g Makefile + + To test the results, issue: + +make check + Install the package: make LD_LIBRARY_PATH=/tools/lib install diff --git a/chapter06/xz.xml b/chapter06/xz.xml index d97a06a3c..07deb6183 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -46,8 +46,7 @@ Prepare Xz for compilation with: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/xz-&xz-version; +./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version; Compile the package: