Skip to content

GitLab

C
coreutils
Commit ee989aad authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated coreutils to 8.31

parent fb7a7e95
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 277 deletions
Makefile
View file @ ee989aad
all: export FORCE_UNSAFE_CONFIGURE := 1
all:
tar xf coreutils-8.29.tar.xz
patch -Np1 -d coreutils-8.29 < coreutils-8.29-i18n-1.patch
cd coreutils-8.29 && sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk
cd coreutils-8.29 && autoreconf -fiv
cd coreutils-8.29 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-no-install-program=kill,uptime
$(MAKE) -C coreutils-8.29
tar xf coreutils-8.31.tar.xz
patch -Np1 -d coreutils-8.31 < coreutils-8.31-i18n-1.patch
cd coreutils-8.31 && sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk
cd coreutils-8.31 && autoreconf -fiv
cd coreutils-8.31 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-no-install-program=kill,uptime
$(MAKE) -C coreutils-8.31
-if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
$(MAKE) -C coreutils-8.29 NON_ROOT_USERNAME=nobody check-root ; \
$(MAKE) -C coreutils-8.31 NON_ROOT_USERNAME=nobody check-root ; \
echo "dummy:x:1000:nobody" >> /etc/group ; \
cd coreutils-8.29 ; \
cd coreutils-8.31 ; \
chown -Rv nobody . ; \
su nobody -s /bin/bash -c "PATH=$$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true" ; \
sed -i '/dummy/d' /etc/group ; \
fi
$(MAKE) -C coreutils-8.29 install
$(MAKE) -C coreutils-8.31 install
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/{mv,pwd,rm,rmdir,stty,true,uname} /bin
......@@ -22,4 +22,4 @@ all:
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
mv -v /usr/bin/{head,sleep,nice,test,[} /bin
rm -rf coreutils-8.29
rm -rf coreutils-8.31
build.xml
View file @ ee989aad
<project name="coreutils">
<target name="temporary-coreutils">
<property name="makedir" value="${builddir}/coreutils-8.29"/>
<property name="makedir" value="${builddir}/coreutils-8.31"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/coreutils/coreutils-8.29.tar.xz -C ${builddir}"/>
<arg line="xf packages/coreutils/coreutils-8.31.tar.xz -C ${builddir}"/>
</exec>
<exec executable="patch" dir="${makedir}" failonerror="true">
<arg line="-Np1 -i ${basedir}/packages/coreutils/coreutils-8.29-noman.patch"/>
<arg line="-Np1 -i ${basedir}/packages/coreutils/coreutils-8.31-noman.patch"/>
</exec>
<echo file="${makedir}/config.cache">fu_cv_sys_stat_statfs2_bsize=yes
gl_cv_func_working_mkstemp=yes
......
coreutils-8.29-noman.patch → coreutils-8.31-noman.patch
View file @ ee989aad
diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
--- coreutils-8.29/Makefile.in 2017-12-28 04:55:58.000000000 +1030
+++ coreutils-8.29-noman/Makefile.in 2018-06-01 12:17:50.526109553 +0930
@@ -2596,7 +2596,7 @@
diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
--- coreutils-8.31/Makefile.in 2019-03-11 10:37:54.000000000 +1030
+++ coreutils-8.31-noman/Makefile.in 2019-08-30 14:34:35.919174733 +0930
@@ -2907,7 +2907,7 @@
$(top_srcdir)/build-aux/texinfo.tex \
$(top_srcdir)/build-aux/ylwrap $(top_srcdir)/doc/local.mk \
$(top_srcdir)/lib/alloca.c $(top_srcdir)/lib/config.hin \
......@@ -10,7 +10,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
$(top_srcdir)/src/local.mk $(top_srcdir)/src/single-binary.mk \
$(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \
ChangeLog INSTALL NEWS README THANKS TODO build-aux/ar-lib \
@@ -2697,7 +2697,6 @@
@@ -3009,7 +3009,6 @@
EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
ERRNO_H = @ERRNO_H@
EXEEXT = @EXEEXT@
......@@ -18,7 +18,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
FLOAT_H = @FLOAT_H@
FNMATCH_H = @FNMATCH_H@
GETADDRINFO_LIB = @GETADDRINFO_LIB@
@@ -3978,7 +3977,6 @@
@@ -4316,7 +4315,6 @@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
......@@ -26,7 +26,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -4171,9 +4169,8 @@
@@ -4510,9 +4508,8 @@
lib/xgetcwd.h lib/xnanosleep.h lib/xreadlink.h lib/xstrtod.h \
lib/xstrtol.h lib/xstrtod.c lib/xstrtod.h lib/xalloc.h \
lib/yesno.h src/dcgen src/dircolors.hin src/primes.h \
......@@ -38,7 +38,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
tests/CuSkip.pm tests/CuTmpdir.pm tests/d_type-check \
tests/envvar-check tests/factor/run.sh \
tests/factor/create-test.sh tests/filefrag-extent-compare \
@@ -4231,8 +4228,7 @@
@@ -4570,8 +4567,7 @@
MAINTAINERCLEANFILES = THANKS-to-translators lib/iconv_open-aix.h \
lib/iconv_open-hpux.h lib/iconv_open-irix.h \
lib/iconv_open-osf.h lib/iconv_open-solaris.h \
......@@ -48,7 +48,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
# Sort in traditional ASCII order, regardless of the current locale;
# otherwise we may get into trouble with distinct strings that the
@@ -5147,19 +5143,6 @@
@@ -5494,19 +5490,6 @@
} \
END {$$m and (warn "$@: do not use upper case in \@var{...}\n"), exit 1}'
......@@ -68,12 +68,12 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
# Indirections required so that we'll still be able to know the
# complete list of our tests even if the user overrides TESTS
# from the command line (as permitted by the test harness API).
@@ -5990,10 +5973,10 @@
@@ -6351,10 +6334,10 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs .x .xpl .xpl$(EXEEXT) .y
+.SUFFIXES: .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs .xpl .xpl$(EXEEXT) .y
-.SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs .x .xpl .xpl$(EXEEXT) .y
+.SUFFIXES: .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs .xpl .xpl$(EXEEXT) .y
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(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__configure_deps)
......@@ -81,7 +81,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -6015,7 +5998,7 @@
@@ -6376,7 +6359,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
......@@ -90,7 +90,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -14764,150 +14747,6 @@
@@ -15181,151 +15164,6 @@
check-local: check-texinfo
......@@ -109,6 +109,7 @@ diff -uNr coreutils-8.29/Makefile.in coreutils-8.29-noman/Makefile.in
-@SINGLE_BINARY_FALSE@man/base32.1: src/base32$(EXEEXT)
-@SINGLE_BINARY_FALSE@man/base64.1: src/base64$(EXEEXT)
-@SINGLE_BINARY_FALSE@man/basename.1: src/basename$(EXEEXT)
-@SINGLE_BINARY_FALSE@man/basenc.1: src/basenc$(EXEEXT)
-@SINGLE_BINARY_FALSE@man/cat.1: src/cat$(EXEEXT)
-@SINGLE_BINARY_FALSE@man/chcon.1: src/chcon$(EXEEXT)
-@SINGLE_BINARY_FALSE@man/chgrp.1: src/chgrp$(EXEEXT)
......
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