Commit abd0749a authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded util-linux to 2.37

parent 1617cc46
all:
tar xf util-linux-2.35.2.tar.xz
patch -Np1 -d util-linux-2.35.2 < util-linux-2.35.2-no_C.UTF-8_locale.patch
tar xf util-linux-2.37.tar.xz
patch -Np1 -d util-linux-2.37 < util-linux-2.37-no_C.UTF-8_locale.patch
mkdir -pv /var/lib/hwclock
cd util-linux-2.35.2 && ./configure --build=$(CLFS_TARGET) ADJTIME_PATH=/var/lib/hwclock/adjtime --docdir=/usr/share/doc/util-linux-2.35.2 --disable-chfn-chsh --disable-login --disable-nologin --disable-su --disable-setpriv --disable-runuser --disable-pylibmount --disable-static
$(MAKE) -C util-linux-2.35.2
cd util-linux-2.37 && ./configure --build=$(CLFS_TARGET) ADJTIME_PATH=/var/lib/hwclock/adjtime --docdir=/usr/share/doc/util-linux-2.37 --disable-chfn-chsh --disable-login --disable-nologin --disable-su --disable-setpriv --disable-runuser --disable-pylibmount --disable-static
$(MAKE) -C util-linux-2.37
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
cd util-linux-2.35.2 ; \
cd util-linux-2.37 ; \
chown -Rv nobody . ; \
su nobody -s /bin/bash -c "PATH=$$PATH make -k check TESTS_OPTIONS='--exclude=misc/setarch'" ; \
su nobody -s /bin/bash -c "PATH=$$PATH make -k check TESTS_OPTIONS='--exclude=\"lscpu/lscpu-armv7 lscpu/lscpu-ppc-qemu lscpu/lscpu-ppc64-POWER7-64cpu lscpu/lscpu-ppc64-POWER7 lscpu/lscpu-s390-kvm lscpu/lscpu-s390-lpar-drawer lscpu/lscpu-s390-lpar lscpu/lscpu-s390-nested-virt lscpu/lscpu-s390-zvm lscpu/lscpu-sparc64 lscpu/lscpu-vbox-win lscpu/lscpu-vmware_fpe lscpu/lscpu-x86_64-64cpu lscpu/lscpu-x86_64-dell_e4310 lscpu/lscpu-x86_64-epyc_7451 lsns/ioctl_ns\"'" ; \
fi
$(MAKE) -C util-linux-2.35.2 install
rm -rf util-linux-2.35.2
$(MAKE) -C util-linux-2.37 install
rm -rf util-linux-2.37
<project name="util-linux">
<target name="temporary-util-linux">
<property name="makedir" value="${builddir}/util-linux-2.35.2"/>
<property name="makedir" value="${builddir}/util-linux-2.37"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/util-linux/util-linux-2.35.2.tar.xz -C ${builddir}"/>
<arg line="xf packages/util-linux/util-linux-2.37.tar.xz -C ${builddir}"/>
</exec>
<exec executable="./configure" dir="${makedir}" failonerror="true">
<env key="PATH" path="${PATH}"/>
......
diff -uNr util-linux-2.35.2/tests/ts/column/invalid-multibyte util-linux-2.35.2-no_C.UTF-8_locale/tests/ts/column/invalid-multibyte
--- util-linux-2.35.2/tests/ts/column/invalid-multibyte 2020-02-27 19:56:34.731140139 +1030
+++ util-linux-2.35.2-no_C.UTF-8_locale/tests/ts/column/invalid-multibyte 2020-07-12 11:16:52.743959580 +0930
diff -uNr util-linux-2.37/tests/ts/column/invalid-multibyte util-linux-2.37-no_C.UTF-8_locale/tests/ts/column/invalid-multibyte
--- util-linux-2.37/tests/ts/column/invalid-multibyte 2021-05-06 20:25:47.068422559 +0930
+++ util-linux-2.37-no_C.UTF-8_locale/tests/ts/column/invalid-multibyte 2022-10-10 17:36:20.158256217 +1030
@@ -25,6 +25,6 @@
ts_cd "$TS_OUTDIR"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment