diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml index fd6d13bb6..6f77fce88 100644 --- a/chapter07/util-linux.xml +++ b/chapter07/util-linux.xml @@ -141,20 +141,21 @@ Prepare Util-linux for compilation: CC="gcc -m32" \ -./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ +./configure --host=i686-pc-linux-gnu \ --libdir=/usr/lib32 \ - --host=i686-pc-linux-gnu \ + --runstatedir=/run \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ - --disable-chfn-chsh \ - --disable-login \ - --disable-nologin \ - --disable-su \ - --disable-setpriv \ - --disable-runuser \ - --disable-pylibmount \ - --disable-static \ - --without-python \ - runstatedir=/run + --disable-chfn-chsh \ + --disable-login \ + --disable-nologin \ + --disable-su \ + --disable-setpriv \ + --disable-runuser \ + --disable-pylibmount \ + --disable-static \ + --disable-liblastlog2 \ + --without-python \ + ADJTIME_PATH=/var/lib/hwclock/adjtime Compile the package: @@ -182,20 +183,21 @@ rm -rf DESTDIR Prepare Util-linux for compilation: CC="gcc -mx32" \ -./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ - --libdir=/usr/libx32 \ - --host=x86_64-pc-linux-gnux32 \ +./configure --host=x86_64-pc-linux-gnux32 \ + --libdir=/usr/libx32 \ + --runstatedir=/run \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ - --disable-chfn-chsh \ - --disable-login \ - --disable-nologin \ - --disable-su \ - --disable-setpriv \ - --disable-runuser \ - --disable-pylibmount \ - --disable-static \ - --without-python \ - runstatedir=/run + --disable-chfn-chsh \ + --disable-login \ + --disable-nologin \ + --disable-su \ + --disable-setpriv \ + --disable-runuser \ + --disable-pylibmount \ + --disable-static \ + --disable-liblastlog2 \ + --without-python \ + ADJTIME_PATH=/var/lib/hwclock/adjtime Compile the package: diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml index 10eb6f11e..3badc664f 100644 --- a/chapter08/util-linux.xml +++ b/chapter08/util-linux.xml @@ -152,6 +152,8 @@ su tester -c "make -k check" ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ --host=i686-pc-linux-gnu \ --libdir=/usr/lib32 \ + --runstatedir=/run \ + --sbindir=/usr/sbin \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ --disable-chfn-chsh \ --disable-login \ @@ -160,6 +162,7 @@ su tester -c "make -k check" --disable-setpriv \ --disable-runuser \ --disable-pylibmount \ + --disable-liblastlog2 \ --disable-static \ --without-python \ --without-systemd \ @@ -169,6 +172,8 @@ su tester -c "make -k check" ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ --host=i686-pc-linux-gnu \ --libdir=/usr/lib32 \ + --runstatedir=/run \ + --sbindir=/usr/sbin \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ --disable-chfn-chsh \ --disable-login \ @@ -177,6 +182,7 @@ su tester -c "make -k check" --disable-setpriv \ --disable-runuser \ --disable-pylibmount \ + --disable-liblastlog2 \ --disable-static \ --without-python @@ -217,33 +223,39 @@ rm -rf DESTDIR CC="gcc -mx32" \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ --host=x86_64-pc-linux-gnux32 \ - --libdir=/usr/libx32 \ + --libdir=/usr/libx32 \ + --runstatedir=/run \ + --sbindir=/usr/sbin \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ - --disable-chfn-chsh \ - --disable-login \ - --disable-nologin \ - --disable-su \ - --disable-setpriv \ - --disable-runuser \ - --disable-pylibmount \ - --disable-static \ - --without-python \ - --without-systemd \ + --disable-chfn-chsh \ + --disable-login \ + --disable-nologin \ + --disable-su \ + --disable-setpriv \ + --disable-runuser \ + --disable-pylibmount \ + --disable-liblastlog2 \ + --disable-static \ + --without-python \ + --without-systemd \ --without-systemdsystemunitdir CC="gcc -mx32" \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ --host=x86_64-pc-linux-gnux32 \ - --libdir=/usr/libx32 \ + --libdir=/usr/libx32 \ + --runstatedir=/run \ + --sbindir=/usr/sbin \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ - --disable-chfn-chsh \ - --disable-login \ - --disable-nologin \ - --disable-su \ - --disable-setpriv \ - --disable-runuser \ - --disable-pylibmount \ - --disable-static \ + --disable-chfn-chsh \ + --disable-login \ + --disable-nologin \ + --disable-su \ + --disable-setpriv \ + --disable-runuser \ + --disable-pylibmount \ + --disable-liblastlog2 \ + --disable-static \ --without-python Restore the tool previously moved away: