kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-14 07:15:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'pder/coreutils' into gcc

Browse source
This commit is contained in:
Andrius Štikonas 2021-03-24 19:37:17 +00:00
commit e30b56cb3e
10 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sysa/coreutils-5.0/checksums/pass2
View file

@ -38,6 +38,7 @@ fa7ff4f943ca592c623e41a303e697114a420c0a3e5d91c779dfd57ab39b7053 /after/bin/pwd
4b7609bd5da6de314b418be80f1be1a525bb4756efb1e9925f0ae7814c6eedef /after/bin/sleep
c40dac27f90c5f793a1ed37e78bd1015e44688dc2179da209b1065d02ed0c6e3 /after/bin/sort
5087a0f86f238062a85f2f6ca3e6b33ba6b3c8dd9700e314c1ae3b2af3331409 /after/bin/split
533d8a75e4460e37714c50eed989a643dffe08e3ab4f7400b966f2241e28a60f /after/bin/sync
35f681f7cc31a895f5c5e0db8b6a3c203b2ed9ce1771503f198614302e42c600 /after/bin/sum
7272d4fb3313ad3e19c79393d8785d4b343a915e605332eebbc8f5ac5338e071 /after/bin/tail
c2c6fae2cad8e29a75ff3f793ca7d059cc50ea4ee7d55f659e8f2d371f7763d6 /after/bin/tee

2
sysa/coreutils-5.0/mk/pass2.mk
View file

@ -83,7 +83,7 @@ CFLAGS = -I . -I lib \
SRC_DIR=src
COREUTILS = basename cat chmod cksum comm csplit cut dd dirname echo env expand expr factor false fmt fold head id join kill link ln logname mkfifo mkdir mknod nl od paste pathchk printf ptx pwd readlink rmdir seq sleep sort split sum tail tee tr tsort uname unexpand uniq unlink wc whoami test true yes
COREUTILS = basename cat chmod cksum comm csplit cut dd dirname echo env expand expr factor false fmt fold head id join kill link ln logname mkfifo mkdir mknod nl od paste pathchk printf ptx pwd readlink rmdir seq sleep sort split sum sync tail tee tr tsort uname unexpand uniq unlink wc whoami test true yes
BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))

3
sysa/coreutils-6.10/checksums Normal file
View file

@ -0,0 +1,3 @@
98124acfaf5cd8c1795d9557455607fb157a514867de5b908a9a3c8d00d88717 /after/bin/date
fe8a8a6d39e35ca2d980ac0dfb57204f34c34aa2ec543bc15f93ff80bcbbd38a /after/bin/mktemp
40289b9aae91f72a7d44bbc93616dcf2397b60d2532b549d053f3ce9b1040119 /after/bin/sha256sum

5
sysa/coreutils-6.3/coreutils-6.3.sh → sysa/coreutils-6.10/coreutils-6.10.sh
View file

@ -4,10 +4,7 @@
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
mv lib/fnmatch.in.h lib/fnmatch.h
# Rebuild bison pre-generated file
rm lib/getdate.c

19
sysa/coreutils-6.3/mk/main.mk → sysa/coreutils-6.10/mk/main.mk
View file

@ -6,8 +6,8 @@
PACKAGE=coreutils
PACKAGE_NAME=GNU\ coreutils
PACKAGE_BUGREPORT=bug-coreutils@gnu.org
PACKAGE_VERSION=6.3
VERSION=6.3
PACKAGE_VERSION=6.10
VERSION=6.10
CC = tcc
LD = tcc
@ -75,7 +75,11 @@ CFLAGS = -I . -I lib \
-Dminor_t=unsigned \
-DHAVE_GETTIMEOFDAY=1 \
-DHAVE_TIME_R_POSIX=1 \
-DHASH_ALGO_SHA256
-DHASH_ALGO_SHA256 \
-DFLEXIBLE_ARRAY_MEMBER \
-DS_IRWXUGO='(S_IRWXU | S_IRWXG | S_IRWXO)' \
-DGNULIB_CANONICALIZE \
-DO_BINARY=0
.PHONY: all install
@ -85,11 +89,11 @@ COREUTILS = date
BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
ALL=$(BINARIES) $(SRC_DIR)/sha256sum
all: $(BINARIES) $(SRC_DIR)/sha256sum
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 xreadlink xstrtod xstrtol xstrtoul xstrtoimax xstrtoumax yesno strnlen getcwd sig2str mountlist canonicalize mkstemp memrchr euidaccess obstack strverscmp strftime xalloc-die close-stream
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)))
@ -102,5 +106,8 @@ $(BINARIES) : % : %.o $(LIB_DIR)/libfettish.a
$(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)

1
sysa/coreutils-6.3/checksums
View file

@ -1 +0,0 @@
34ec35d9de41dd954802dbcfc7c07697f1e7e3cecedbe32ea16a6da85c3eb260 /after/bin/sha256sum

4
sysa/run.sh
View file

@ -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