Commit 799b072f authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Updated util-linux to 2.38

parent 8785fe5d
all: all:
tar xf util-linux-2.37.tar.xz tar xf util-linux-2.38.tar.xz
patch -Np1 -d util-linux-2.37 < util-linux-2.37-no_C.UTF-8_locale.patch patch -Np1 -d util-linux-2.38 < util-linux-2.38-no_C.UTF-8_locale.patch
mkdir -pv /var/lib/hwclock mkdir -pv /var/lib/hwclock
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 cd util-linux-2.38 && ./configure --build=$(CLFS_TARGET) ADJTIME_PATH=/var/lib/hwclock/adjtime --docdir=/usr/share/doc/util-linux-2.38 --disable-chfn-chsh --disable-login --disable-nologin --disable-su --disable-setpriv --disable-runuser --disable-pylibmount --disable-static
$(MAKE) -C util-linux-2.37 $(MAKE) -C util-linux-2.38
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \ if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
cd util-linux-2.37 ; \ cd util-linux-2.38 ; \
chown -Rv nobody . ; \ chown -Rv nobody . ; \
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 script/options-size\"'" ; \ 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 script/options-size\"'" ; \
fi fi
$(MAKE) -C util-linux-2.37 install $(MAKE) -C util-linux-2.38 install
rm -rf util-linux-2.37 rm -rf util-linux-2.38
<project name="util-linux"> <project name="util-linux">
<target name="temporary-util-linux"> <target name="temporary-util-linux">
<property name="makedir" value="${builddir}/util-linux-2.37"/> <property name="makedir" value="${builddir}/util-linux-2.38"/>
<exec executable="tar" failonerror="true"> <exec executable="tar" failonerror="true">
<arg line="xf packages/util-linux/util-linux-2.37.tar.xz -C ${builddir}"/> <arg line="xf packages/util-linux/util-linux-2.38.tar.xz -C ${builddir}"/>
</exec> </exec>
<exec executable="./configure" dir="${makedir}" failonerror="true"> <exec executable="./configure" dir="${makedir}" failonerror="true">
<env key="PATH" path="${PATH}"/> <env key="PATH" path="${PATH}"/>
......
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 diff -uNr util-linux-2.38/tests/ts/column/invalid-multibyte util-linux-2.38-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.38/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 +++ util-linux-2.38-no_C.UTF-8_locale/tests/ts/column/invalid-multibyte 2026-05-18 18:34:35.682111566 +0930
@@ -25,6 +25,6 @@ @@ -25,6 +25,6 @@
ts_cd "$TS_OUTDIR" 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