Commit b06d2885 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded coreutils to 8.32

parent ee989aad
all: export FORCE_UNSAFE_CONFIGURE := 1 all: export FORCE_UNSAFE_CONFIGURE := 1
all: all:
tar xf coreutils-8.31.tar.xz tar xf coreutils-8.32.tar.xz
patch -Np1 -d coreutils-8.31 < coreutils-8.31-i18n-1.patch patch -Np1 -d coreutils-8.32 < coreutils-8.32-i18n-1.patch
cd coreutils-8.31 && sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk cd coreutils-8.32 && sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk
cd coreutils-8.31 && autoreconf -fiv cd coreutils-8.32 && autoreconf -fiv
cd coreutils-8.31 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-no-install-program=kill,uptime cd coreutils-8.32 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-no-install-program=kill,uptime
$(MAKE) -C coreutils-8.31 $(MAKE) -C coreutils-8.32
-if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \ -if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
$(MAKE) -C coreutils-8.31 NON_ROOT_USERNAME=nobody check-root ; \ $(MAKE) -C coreutils-8.32 NON_ROOT_USERNAME=nobody check-root ; \
echo "dummy:x:1000:nobody" >> /etc/group ; \ echo "dummy:x:1000:nobody" >> /etc/group ; \
cd coreutils-8.31 ; \ cd coreutils-8.32 ; \
chown -Rv nobody . ; \ chown -Rv nobody . ; \
su nobody -s /bin/bash -c "PATH=$$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true" ; \ su nobody -s /bin/bash -c "PATH=$$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true" ; \
sed -i '/dummy/d' /etc/group ; \ sed -i '/dummy/d' /etc/group ; \
fi fi
$(MAKE) -C coreutils-8.31 install $(MAKE) -C coreutils-8.32 install
mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
mv -v /usr/bin/{dd,df,echo,false,ln,ls,mkdir,mknod} /bin mv -v /usr/bin/{dd,df,echo,false,ln,ls,mkdir,mknod} /bin
mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
...@@ -22,4 +22,4 @@ all: ...@@ -22,4 +22,4 @@ all:
mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8 mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8
sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8 sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8
mv -v /usr/bin/{head,sleep,nice,test,[} /bin mv -v /usr/bin/{head,sleep,nice,test,[} /bin
rm -rf coreutils-8.31 rm -rf coreutils-8.32
<project name="coreutils"> <project name="coreutils">
<target name="temporary-coreutils"> <target name="temporary-coreutils">
<property name="makedir" value="${builddir}/coreutils-8.31"/> <property name="makedir" value="${builddir}/coreutils-8.32"/>
<exec executable="tar" failonerror="true"> <exec executable="tar" failonerror="true">
<arg line="xf packages/coreutils/coreutils-8.31.tar.xz -C ${builddir}"/> <arg line="xf packages/coreutils/coreutils-8.32.tar.xz -C ${builddir}"/>
</exec> </exec>
<exec executable="patch" dir="${makedir}" failonerror="true"> <exec executable="patch" dir="${makedir}" failonerror="true">
<arg line="-Np1 -i ${basedir}/packages/coreutils/coreutils-8.31-noman.patch"/> <arg line="-Np1 -i ${basedir}/packages/coreutils/coreutils-8.32-noman.patch"/>
</exec> </exec>
<echo file="${makedir}/config.cache">fu_cv_sys_stat_statfs2_bsize=yes <echo file="${makedir}/config.cache">fu_cv_sys_stat_statfs2_bsize=yes
gl_cv_func_working_mkstemp=yes gl_cv_func_working_mkstemp=yes
......
diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in diff -uNr coreutils-8.32/Makefile.in coreutils-8.32-noman/Makefile.in
--- coreutils-8.31/Makefile.in 2019-03-11 10:37:54.000000000 +1030 --- coreutils-8.32/Makefile.in 2020-03-06 00:33:51.000000000 +1030
+++ coreutils-8.31-noman/Makefile.in 2019-08-30 14:34:35.919174733 +0930 +++ coreutils-8.32-noman/Makefile.in 2020-07-02 16:06:08.290547172 +0930
@@ -2907,7 +2907,7 @@ @@ -3413,7 +3413,7 @@
$(top_srcdir)/build-aux/texinfo.tex \ $(top_srcdir)/build-aux/texinfo.tex \
$(top_srcdir)/build-aux/ylwrap $(top_srcdir)/doc/local.mk \ $(top_srcdir)/build-aux/ylwrap $(top_srcdir)/doc/local.mk \
$(top_srcdir)/lib/alloca.c $(top_srcdir)/lib/config.hin \ $(top_srcdir)/lib/alloca.c $(top_srcdir)/lib/config.hin \
...@@ -10,7 +10,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in ...@@ -10,7 +10,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
$(top_srcdir)/src/local.mk $(top_srcdir)/src/single-binary.mk \ $(top_srcdir)/src/local.mk $(top_srcdir)/src/single-binary.mk \
$(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \ $(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \
ChangeLog INSTALL NEWS README THANKS TODO build-aux/ar-lib \ ChangeLog INSTALL NEWS README THANKS TODO build-aux/ar-lib \
@@ -3009,7 +3009,6 @@ @@ -3516,7 +3516,6 @@
EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
ERRNO_H = @ERRNO_H@ ERRNO_H = @ERRNO_H@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
...@@ -18,7 +18,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in ...@@ -18,7 +18,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
FLOAT_H = @FLOAT_H@ FLOAT_H = @FLOAT_H@
FNMATCH_H = @FNMATCH_H@ FNMATCH_H = @FNMATCH_H@
GETADDRINFO_LIB = @GETADDRINFO_LIB@ GETADDRINFO_LIB = @GETADDRINFO_LIB@
@@ -4316,7 +4315,6 @@ @@ -4961,7 +4960,6 @@
lispdir = @lispdir@ lispdir = @lispdir@
localedir = @localedir@ localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
...@@ -26,9 +26,9 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in ...@@ -26,9 +26,9 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
@@ -4510,9 +4508,8 @@ @@ -5172,9 +5170,8 @@
lib/xgetcwd.h lib/xnanosleep.h lib/xreadlink.h lib/xstrtod.h \ lib/xreadlink.h lib/xstrtod.h lib/xstrtol.h \
lib/xstrtol.h lib/xstrtod.c lib/xstrtod.h lib/xalloc.h \ lib/xstrtol-error.h lib/xstrtod.c lib/xstrtod.h lib/xalloc.h \
lib/yesno.h src/dcgen src/dircolors.hin src/primes.h \ lib/yesno.h src/dcgen src/dircolors.hin src/primes.h \
- src/tac-pipe.c src/extract-magic man/help2man man/dummy-man \ - src/tac-pipe.c src/extract-magic man/help2man man/dummy-man \
- $(man1_MANS) $(man1_MANS:.1=.x) $(EXTRA_MANS) \ - $(man1_MANS) $(man1_MANS:.1=.x) $(EXTRA_MANS) \
...@@ -38,17 +38,16 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in ...@@ -38,17 +38,16 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
tests/CuSkip.pm tests/CuTmpdir.pm tests/d_type-check \ tests/CuSkip.pm tests/CuTmpdir.pm tests/d_type-check \
tests/envvar-check tests/factor/run.sh \ tests/envvar-check tests/factor/run.sh \
tests/factor/create-test.sh tests/filefrag-extent-compare \ tests/factor/create-test.sh tests/filefrag-extent-compare \
@@ -4570,8 +4567,7 @@ @@ -5234,7 +5231,7 @@
MAINTAINERCLEANFILES = THANKS-to-translators lib/iconv_open-aix.h \
lib/iconv_open-hpux.h lib/iconv_open-irix.h \ lib/iconv_open-hpux.h lib/iconv_open-irix.h \
lib/iconv_open-osf.h lib/iconv_open-solaris.h \ lib/iconv_open-osf.h lib/iconv_open-solaris.h \
- lib/parse-datetime.c $(BUILT_SOURCES) doc/constants.texi \ lib/iconv_open-zos.h lib/parse-datetime.c $(BUILT_SOURCES) \
- $(ALL_MANS) - doc/constants.texi $(ALL_MANS)
+ lib/parse-datetime.c $(BUILT_SOURCES) doc/constants.texi + doc/constants.texi
# Sort in traditional ASCII order, regardless of the current locale; # Sort in traditional ASCII order, regardless of the current locale;
# otherwise we may get into trouble with distinct strings that the # otherwise we may get into trouble with distinct strings that the
@@ -5494,19 +5490,6 @@ @@ -6165,19 +6162,6 @@
} \ } \
END {$$m and (warn "$@: do not use upper case in \@var{...}\n"), exit 1}' END {$$m and (warn "$@: do not use upper case in \@var{...}\n"), exit 1}'
...@@ -68,7 +67,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in ...@@ -68,7 +67,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
# Indirections required so that we'll still be able to know the # Indirections required so that we'll still be able to know the
# complete list of our tests even if the user overrides TESTS # complete list of our tests even if the user overrides TESTS
# from the command line (as permitted by the test harness API). # from the command line (as permitted by the test harness API).
@@ -6351,10 +6334,10 @@ @@ -7027,10 +7011,10 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES: .SUFFIXES:
...@@ -81,16 +80,16 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in ...@@ -81,16 +80,16 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
@@ -6376,7 +6359,7 @@ @@ -7052,7 +7036,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac; esac;
-$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__empty): -$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__empty):
+$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/tests/local.mk $(am__empty): +$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/tests/local.mk $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
@@ -15181,151 +15164,6 @@ @@ -17510,151 +17494,6 @@
check-local: check-texinfo check-local: check-texinfo
......
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