commit: 366dc2eac54df83de930182175d762e97bbe842c
parent 19c113127bedd69d6e7ad7aaf6f82e3f246419ce
Author: Paul Dersey <pdersey@gmail.com>
Date: Tue, 23 Mar 2021 15:14:45 -0400
Replace coreutils-6.3 with coreutils-6.10
Build only date, mktemp, and sha256sum
Diffstat:
10 files changed, 152 insertions(+), 145 deletions(-)
diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
@@ -19,7 +19,7 @@ e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59 binutils-2.14.
7007fc89c216fbfaff5525359b02a7e5b612694df5168c74673f67055f015095 bison-3.4.1.tar.gz
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 bzip2-1.0.8.tar.gz
c25b36b8af6e0ad2a875daf4d6196bd0df28a62be7dd252e5f99a4d5d7288d95 coreutils-5.0.tar.bz2
-8815a918867a14dcfeb623786b3a7f7483a039a78dd5a94e9b562667684c07a1 coreutils-6.3.tar.bz2
+1d013547889f20576460249c4210632d5314531c8477378a2e046b13a8ebeb7e coreutils-6.10.tar.gz
d5f2489c4056a31528e3ada4adacc23d498532b0af1a980f2f76158162b139d6 diffutils-2.7.tar.gz
bc79b890f35ca38d66ff89a6e3758226131e51ccbd10ef78d5ff150b7bd73689 flex-2.5.11.tar.gz
e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 flex-2.6.4.tar.gz
diff --git a/parts.rst b/parts.rst
@@ -307,10 +307,11 @@ coreutils 5.0
including ``comm``, ``expr``, ``dd``, ``sort``, ``sync``, ``uname`` and
``uniq``. This fixes a variety of issues with existing ``coreutils``.
-coreutils 6.3
+coreutils 6.10
=============
-We build ``sha256sum`` from coreutils 6.3 since it is absent in 5.0.
-Other utils are not build at this stage.
+We build ``date``, ``mktemp`` and ``sha256sum`` from coreutils 6.10 which are
+either missing or don't build correctly in 5.0. Other utils are not built at
+this stage.
gawk 3.0.4
==========
diff --git a/rootfs.sh b/rootfs.sh
@@ -183,8 +183,8 @@ get_file https://ftp.gnu.org/gnu/grep/grep-2.4.tar.gz
# diffutils 2.7
get_file https://ftp.gnu.org/gnu/diffutils/diffutils-2.7.tar.gz
-# coreutils 6.3
-get_file https://ftp.gnu.org/gnu/coreutils/coreutils-6.3.tar.bz2
+# coreutils 6.10
+get_file https://ftp.gnu.org/gnu/coreutils/coreutils-6.10.tar.gz
# gawk 3.0.4
get_file https://ftp.gnu.org/gnu/gawk/gawk-3.0.4.tar.gz
diff --git a/sysa/coreutils-6.10/checksums b/sysa/coreutils-6.10/checksums
@@ -0,0 +1,3 @@
+98124acfaf5cd8c1795d9557455607fb157a514867de5b908a9a3c8d00d88717 /after/bin/date
+fe8a8a6d39e35ca2d980ac0dfb57204f34c34aa2ec543bc15f93ff80bcbbd38a /after/bin/mktemp
+40289b9aae91f72a7d44bbc93616dcf2397b60d2532b549d053f3ce9b1040119 /after/bin/sha256sum
diff --git a/sysa/coreutils-6.10/coreutils-6.10.sh b/sysa/coreutils-6.10/coreutils-6.10.sh
@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+ default_src_prepare
+ mv lib/fnmatch.in.h lib/fnmatch.h
+
+ # Rebuild bison pre-generated file
+ rm lib/getdate.c
+ cd lib
+ bison --update getdate.y
+ bison getdate.y
+ mv getdate.tab.c getdate.c
+ cd ..
+
+ catm config.h
+ catm lib/configmake.h
+}
+
+src_compile() {
+ make -f Makefile
+}
+
+src_install() {
+ make -f Makefile install PREFIX="${PREFIX}"
+}
diff --git a/sysa/coreutils-6.10/mk/main.mk b/sysa/coreutils-6.10/mk/main.mk
@@ -0,0 +1,113 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+PACKAGE=coreutils
+PACKAGE_NAME=GNU\ coreutils
+PACKAGE_BUGREPORT=bug-coreutils@gnu.org
+PACKAGE_VERSION=6.10
+VERSION=6.10
+
+CC = tcc
+LD = tcc
+AR = tcc -ar
+
+bindir=/after/bin
+
+CFLAGS = -I . -I lib \
+ -DPACKAGE=\"$(PACKAGE)\" \
+ -DPACKAGE_NAME=\"$(PACKAGE_NAME)\" \
+ -DGNU_PACKAGE=\"$(PACKAGE_NAME)\" \
+ -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" \
+ -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
+ -DHOST_OPERATING_SYSTEM=\"Linux\" \
+ -DVERSION=\"$(VERSION)\" \
+ -DHAVE_LIMITS_H=1 \
+ -DHAVE_DECL_FREE=1 \
+ -DHAVE_LONG_LONG=1 \
+ -DHAVE_UNSIGNED_LONG_LONG=1 \
+ -DHAVE_DECL_MALLOC=1 \
+ -DHAVE_DECL_STRERROR=1 \
+ -DHAVE_STRERROR=1 \
+ -DHAVE_MALLOC=1 \
+ -DHAVE_STDLIB_H=1 \
+ -DHAVE_WCHAR_H=1 \
+ -DHAVE_SYS_TYPES_H=1 \
+ -DHAVE_REALLOC=1 \
+ -DHAVE_DECL_REALLOC=1 \
+ -DHAVE_DECL_GETENV=1 \
+ -DHAVE_DIRENT_H=1 \
+ -DHAVE_DECL___FPENDING=0 \
+ -DSTDC_HEADERS=1 \
+ -DHAVE_ALLOCA_H=1 \
+ -DHAVE_STRUCT_TIMESPEC=1 \
+ -DHAVE_STRING_H=1 \
+ -DHAVE_SYS_TIME_H=1 \
+ -DHAVE_SETLOCALE=1 \
+ -DHAVE_LOCALE_H=1 \
+ -DTIME_WITH_SYS_TIME=1 \
+ -DHAVE_STDINT_H=1 \
+ -DLIBDIR=\"/after/lib\" \
+ -DHAVE_DECL_WCWIDTH=0 \
+ -DHAVE_SYS_STAT_H=1 \
+ -DHAVE_INTTYPES_H=1 \
+ -DHAVE_DECL_MEMCHR=1 \
+ -DHAVE_MEMORY_H=1 \
+ -DPENDING_OUTPUT_N_BYTES=1 \
+ -DLOCALEDIR=NULL \
+ -DHAVE_FCNTL_H=1 \
+ -DEPERM=1 \
+ -DHAVE_DECL_STRTOUL=1 \
+ -DHAVE_DECL_STRTOULL=1 \
+ -DHAVE_DECL_STRTOL=1 \
+ -DHAVE_DECL_STRTOLL=1 \
+ -DHAVE_RMDIR=1 \
+ -DRMDIR_ERRNO_NOT_EMPTY=39 \
+ -DHAVE_DECL_FREE=1 \
+ -DLSTAT_FOLLOWS_SLASHED_SYMLINK=1 \
+ -DHAVE_DECL_DIRFD=1 \
+ -DHAVE_GETCWD=1 \
+ -Dmy_strftime=nstrftime \
+ -DDIR_TO_FD\(Dir_p\)=-1 \
+ -DUTILS_OPEN_MAX=1000 \
+ -Dmajor_t=unsigned \
+ -Dminor_t=unsigned \
+ -DHAVE_GETTIMEOFDAY=1 \
+ -DHAVE_TIME_R_POSIX=1 \
+ -DHASH_ALGO_SHA256 \
+ -DFLEXIBLE_ARRAY_MEMBER \
+ -DS_IRWXUGO='(S_IRWXU | S_IRWXG | S_IRWXO)' \
+ -DGNULIB_CANONICALIZE \
+ -DO_BINARY=0
+
+.PHONY: all install
+
+SRC_DIR=src
+
+COREUTILS = date
+
+BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
+
+ALL=$(BINARIES) $(SRC_DIR)/sha256sum $(SRC_DIR)/mktemp
+all: $(BINARIES) $(SRC_DIR)/sha256sum $(SRC_DIR)/mktemp
+
+LIB_DIR = lib
+LIB_SRC = acl alloca getdate fprintftime posixtm posixver strftime getopt hash hash-pjw argmatch backupfile basename canon-host closeout cycle-check diacrit dirname dup-safer error exclude exitfail filemode fpending file-type fnmatch fopen-safer full-read full-write getline gettime hard-locale human idcache imaxtostr linebuffer localcharset long-options mbswidth md5 memcasecmp memcoll modechange offtostr physmem quote quotearg readtokens rpmatch safe-read safe-write same save-cwd savedir settime sha256 stpcpy stripslash umaxtostr unicodeio userspec version-etc version-etc-fsf xgetcwd xgethostname xmalloc xmemcoll xnanosleep readlink xstrtod xstrtol xstrtoul xstrtoimax xstrtoumax yesno strnlen getcwd sig2str mountlist canonicalize mkstemp memrchr euidaccess obstack strverscmp strftime xalloc-die close-stream tempname filenamecat xstrndup randint randread rand-isaac gethrxtime
+
+LIB_OBJECTS = $(addprefix $(LIB_DIR)/, $(addsuffix .o, $(LIB_SRC)))
+
+$(LIB_DIR)/libfettish.a: $(LIB_OBJECTS)
+ $(AR) cr $@ $^
+
+$(BINARIES) : % : %.o $(LIB_DIR)/libfettish.a
+ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
+
+$(SRC_DIR)/sha256sum: $(SRC_DIR)/md5sum.o $(LIB_DIR)/libfettish.a
+ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
+
+$(SRC_DIR)/mktemp: $(SRC_DIR)/mktemp.o $(LIB_DIR)/libfettish.a
+ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
+
+install: $(ALL)
+ install $^ $(bindir)
diff --git a/sysa/coreutils-6.3/checksums b/sysa/coreutils-6.3/checksums
@@ -1 +0,0 @@
-34ec35d9de41dd954802dbcfc7c07697f1e7e3cecedbe32ea16a6da85c3eb260 /after/bin/sha256sum
diff --git a/sysa/coreutils-6.3/coreutils-6.3.sh b/sysa/coreutils-6.3/coreutils-6.3.sh
@@ -1,30 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
- default_src_prepare
-
- cp lib/fnmatch_.h lib/fnmatch.h
- cp lib/fcntl_.h lib/fcntl.h
- sed -i 's#@ABSOLUTE_FCNTL_H@#"/after/include/musl/fcntl.h"#' lib/fcntl.h
-
- # Rebuild bison pre-generated file
- rm lib/getdate.c
- cd lib
- bison --update getdate.y
- bison getdate.y
- mv getdate.tab.c getdate.c
- cd ..
-
- catm config.h
- catm lib/configmake.h
-}
-
-src_compile() {
- make -f Makefile
-}
-
-src_install() {
- make -f Makefile install PREFIX="${PREFIX}"
-}
diff --git a/sysa/coreutils-6.3/mk/main.mk b/sysa/coreutils-6.3/mk/main.mk
@@ -1,106 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-PACKAGE=coreutils
-PACKAGE_NAME=GNU\ coreutils
-PACKAGE_BUGREPORT=bug-coreutils@gnu.org
-PACKAGE_VERSION=6.3
-VERSION=6.3
-
-CC = tcc
-LD = tcc
-AR = tcc -ar
-
-bindir=/after/bin
-
-CFLAGS = -I . -I lib \
- -DPACKAGE=\"$(PACKAGE)\" \
- -DPACKAGE_NAME=\"$(PACKAGE_NAME)\" \
- -DGNU_PACKAGE=\"$(PACKAGE_NAME)\" \
- -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" \
- -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
- -DHOST_OPERATING_SYSTEM=\"Linux\" \
- -DVERSION=\"$(VERSION)\" \
- -DHAVE_LIMITS_H=1 \
- -DHAVE_DECL_FREE=1 \
- -DHAVE_LONG_LONG=1 \
- -DHAVE_UNSIGNED_LONG_LONG=1 \
- -DHAVE_DECL_MALLOC=1 \
- -DHAVE_DECL_STRERROR=1 \
- -DHAVE_STRERROR=1 \
- -DHAVE_MALLOC=1 \
- -DHAVE_STDLIB_H=1 \
- -DHAVE_WCHAR_H=1 \
- -DHAVE_SYS_TYPES_H=1 \
- -DHAVE_REALLOC=1 \
- -DHAVE_DECL_REALLOC=1 \
- -DHAVE_DECL_GETENV=1 \
- -DHAVE_DIRENT_H=1 \
- -DHAVE_DECL___FPENDING=0 \
- -DSTDC_HEADERS=1 \
- -DHAVE_ALLOCA_H=1 \
- -DHAVE_STRUCT_TIMESPEC=1 \
- -DHAVE_STRING_H=1 \
- -DHAVE_SYS_TIME_H=1 \
- -DHAVE_SETLOCALE=1 \
- -DHAVE_LOCALE_H=1 \
- -DTIME_WITH_SYS_TIME=1 \
- -DHAVE_STDINT_H=1 \
- -DLIBDIR=\"/after/lib\" \
- -DHAVE_DECL_WCWIDTH=0 \
- -DHAVE_SYS_STAT_H=1 \
- -DHAVE_INTTYPES_H=1 \
- -DHAVE_DECL_MEMCHR=1 \
- -DHAVE_MEMORY_H=1 \
- -DPENDING_OUTPUT_N_BYTES=1 \
- -DLOCALEDIR=NULL \
- -DHAVE_FCNTL_H=1 \
- -DEPERM=1 \
- -DHAVE_DECL_STRTOUL=1 \
- -DHAVE_DECL_STRTOULL=1 \
- -DHAVE_DECL_STRTOL=1 \
- -DHAVE_DECL_STRTOLL=1 \
- -DHAVE_RMDIR=1 \
- -DRMDIR_ERRNO_NOT_EMPTY=39 \
- -DHAVE_DECL_FREE=1 \
- -DLSTAT_FOLLOWS_SLASHED_SYMLINK=1 \
- -DHAVE_DECL_DIRFD=1 \
- -DHAVE_GETCWD=1 \
- -Dmy_strftime=nstrftime \
- -DDIR_TO_FD\(Dir_p\)=-1 \
- -DUTILS_OPEN_MAX=1000 \
- -Dmajor_t=unsigned \
- -Dminor_t=unsigned \
- -DHAVE_GETTIMEOFDAY=1 \
- -DHAVE_TIME_R_POSIX=1 \
- -DHASH_ALGO_SHA256
-
-.PHONY: all install
-
-SRC_DIR=src
-
-COREUTILS = date
-
-BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
-
-ALL=$(BINARIES) $(SRC_DIR)/sha256sum
-all: $(BINARIES) $(SRC_DIR)/sha256sum
-
-LIB_DIR = lib
-LIB_SRC = acl alloca getdate fprintftime posixtm posixver strftime getopt hash hash-pjw argmatch backupfile basename canon-host closeout cycle-check diacrit dirname dup-safer error exclude exitfail filemode __fpending file-type fnmatch fopen-safer full-read full-write getline gettime hard-locale human idcache imaxtostr linebuffer localcharset long-options mbswidth md5 memcasecmp memcoll modechange offtostr physmem quote quotearg readtokens rpmatch safe-read safe-write same save-cwd savedir settime sha256 stpcpy stripslash umaxtostr unicodeio userspec version-etc version-etc-fsf xgetcwd xgethostname xmalloc xmemcoll xnanosleep xreadlink xstrtod xstrtol xstrtoul xstrtoimax xstrtoumax yesno strnlen getcwd sig2str mountlist canonicalize mkstemp memrchr euidaccess obstack strverscmp strftime xalloc-die close-stream
-
-LIB_OBJECTS = $(addprefix $(LIB_DIR)/, $(addsuffix .o, $(LIB_SRC)))
-
-$(LIB_DIR)/libfettish.a: $(LIB_OBJECTS)
- $(AR) cr $@ $^
-
-$(BINARIES) : % : %.o $(LIB_DIR)/libfettish.a
- $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
-
-$(SRC_DIR)/sha256sum: $(SRC_DIR)/md5sum.o $(LIB_DIR)/libfettish.a
- $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
-
-install: $(ALL)
- install $^ $(bindir)
diff --git a/sysa/run.sh b/sysa/run.sh
@@ -57,8 +57,8 @@ build diffutils-2.7
# Rebuild coreutils using musl
build coreutils-5.0 coreutils-5.0.sh checksums/pass2
-# Build only sha256sum
-build coreutils-6.3
+# Build only date, mktemp and sha256sum
+build coreutils-6.10
build gawk-3.0.4
