mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-02 01:18:08 +01:00
Remove the notion of "sys*"
- This idea originates from very early in the project and was, at the
time, a very easy way to categorise things.
- Now, it doesn't really make much sense - it is fairly arbitary, often
occuring when there is a change in kernel, but not from builder-hex0
to fiwix, and sysb is in reality completely unnecessary.
- In short, the sys* stuff is a bit of a mess that makes the project
more difficult to understand.
- This puts everything down into one folder and has a manifest file that
is used to generate the build scripts on the fly rather than using
coded scripts.
- This is created in the "seed" stage.
stage0-posix -- (calls) --> seed -- (generates) --> main steps
Alongside this change there are a variety of other smaller fixups to the
general structure of the live-bootstrap rootfs.
- Creating a rootfs has become much simpler and is defined as code in
go.sh. The new structure, for an about-to-be booted system, is
/
-- /steps (direct copy of steps/)
-- /distfiles (direct copy of distfiles/)
-- all files from seed/*
-- all files from seed/stage0-posix/*
- There is no longer such a thing as /usr/include/musl, this didn't
really make any sense, as musl is the final libc used. Rather, to
separate musl and mes, we have /usr/include/mes, which is much easier
to work with.
- This also makes mes easier to blow away later.
- A few things that weren't properly in packages have been changed;
checksum-transcriber, simple-patch, kexec-fiwix have all been given
fully qualified package names.
- Highly breaking change, scripts now exist in their package directory
but NOT WITH THE packagename.sh. Rather, they use pass1.sh, pass2.sh,
etc. This avoids manual definition of passes.
- Ditto with patches; default directory is patches, but then any patch
series specific to a pass are named patches-passX.
This commit is contained in:
parent
0907cfd073
commit
6ed2e09f3a
546 changed files with 700 additions and 1299 deletions
138
steps/coreutils-5.0/mk/pass2.mk
Normal file
138
steps/coreutils-5.0/mk/pass2.mk
Normal file
|
|
@ -0,0 +1,138 @@
|
|||
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
|
||||
# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
|
||||
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
PACKAGE=coreutils
|
||||
PACKAGE_NAME=GNU\ coreutils
|
||||
PACKAGE_BUGREPORT=bug-coreutils@gnu.org
|
||||
PACKAGE_VERSION=5.0
|
||||
VERSION=5.0
|
||||
|
||||
CC = tcc
|
||||
LD = tcc
|
||||
AR = tcc -ar
|
||||
|
||||
bindir = $(DESTDIR)$(PREFIX)/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 \
|
||||
-DMB_LEN_MAX=16 \
|
||||
-DLIBDIR=\"$(PREFIX)/lib\" \
|
||||
-DHAVE_DECL_WCWIDTH=0 \
|
||||
-DHAVE_SYS_STAT_H=1 \
|
||||
-DHAVE_SYS_STATFS_H=1 \
|
||||
-DHAVE_SYS_VFS_H=1 \
|
||||
-DHAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
|
||||
-DHAVE_INTTYPES_H=1 \
|
||||
-DHAVE_DECL_MEMCHR=1 \
|
||||
-DHAVE_MEMORY_H=1 \
|
||||
-DPENDING_OUTPUT_N_BYTES=1 \
|
||||
-DCHAR_MIN=0 \
|
||||
-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 \
|
||||
-DENOTEMPTY=1 \
|
||||
-DLSTAT_FOLLOWS_SLASHED_SYMLINK=1 \
|
||||
-DHAVE_DECL_DIRFD=1 \
|
||||
-DLC_TIME=\"C\" \
|
||||
-DLC_COLLATE=\"C\" \
|
||||
-DHAVE_GETCWD=1 \
|
||||
-Dmy_strftime=nstrftime \
|
||||
-DDIR_TO_FD\(Dir_p\)=-1 \
|
||||
-DUTILS_OPEN_MAX=1000 \
|
||||
-Dmajor_t=unsigned \
|
||||
-Dminor_t=unsigned
|
||||
|
||||
.PHONY: all install
|
||||
|
||||
SRC_DIR=src
|
||||
|
||||
COREUTILS = basename cat chmod chroot cksum comm csplit cut dd dirname echo env expand expr 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 stat sum sync tail tee touch tr tsort uname unexpand uniq unlink wc whoami tac test true yes
|
||||
|
||||
BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
|
||||
|
||||
ALL=$(BINARIES) $(SRC_DIR)/cp $(SRC_DIR)/ls $(SRC_DIR)/install $(SRC_DIR)/md5sum $(SRC_DIR)/mv $(SRC_DIR)/rm $(SRC_DIR)/sha1sum
|
||||
all: $(BINARIES) $(SRC_DIR)/cp $(SRC_DIR)/ls $(SRC_DIR)/install $(SRC_DIR)/md5sum $(SRC_DIR)/mv $(SRC_DIR)/rm $(SRC_DIR)/sha1sum
|
||||
|
||||
LIB_DIR = lib
|
||||
LIB_SRC = acl alloca posixtm posixver strftime getopt getopt1 hash hash-pjw addext 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 getstr gettime hard-locale human idcache isdir imaxtostr linebuffer localcharset long-options makepath mbswidth md5 memcasecmp memcoll modechange offtostr path-concat physmem quote quotearg readtokens rpmatch safe-read safe-write same save-cwd savedir settime sha stpcpy stripslash strtoimax strtoumax umaxtostr unicodeio userspec version-etc xgetcwd xgethostname xmalloc xmemcoll xnanosleep xreadlink xstrdup xstrtod xstrtol xstrtoul xstrtoimax xstrtoumax yesno strnlen getcwd sig2str mountlist regex canonicalize mkstemp memrchr euidaccess ftw obstack strverscmp strftime tsearch stat
|
||||
|
||||
LIB_OBJECTS = $(addprefix $(LIB_DIR)/, $(addsuffix .o, $(LIB_SRC)))
|
||||
|
||||
$(SRC_DIR)/false.c: $(SRC_DIR)/true.c
|
||||
cp $< $@
|
||||
sed -i -e s/true/false/g \
|
||||
-e s/success/failure/g \
|
||||
-e 's/(EXIT_SUCCESS)/(EXIT_FAILURE)/g' \
|
||||
$@
|
||||
|
||||
$(LIB_DIR)/libfettish.a: $(LIB_OBJECTS)
|
||||
$(AR) cr $@ $^
|
||||
|
||||
$(BINARIES) : % : %.o $(LIB_DIR)/libfettish.a
|
||||
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
|
||||
|
||||
$(SRC_DIR)/cp: $(SRC_DIR)/cp.o $(SRC_DIR)/copy.o $(SRC_DIR)/cp-hash.c $(LIB_DIR)/libfettish.a
|
||||
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
|
||||
|
||||
$(SRC_DIR)/install: $(SRC_DIR)/install.o $(SRC_DIR)/copy.o $(SRC_DIR)/cp-hash.c $(LIB_DIR)/libfettish.a
|
||||
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
|
||||
|
||||
$(SRC_DIR)/ls: $(SRC_DIR)/ls.o $(SRC_DIR)/ls-ls.o $(LIB_DIR)/libfettish.a
|
||||
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
|
||||
|
||||
$(SRC_DIR)/md5sum: $(SRC_DIR)/md5.o $(SRC_DIR)/md5sum.o $(LIB_DIR)/libfettish.a
|
||||
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
|
||||
|
||||
$(SRC_DIR)/mv: $(SRC_DIR)/mv.o $(SRC_DIR)/copy.o $(SRC_DIR)/remove.o $(SRC_DIR)/cp-hash.o $(LIB_DIR)/libfettish.a
|
||||
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
|
||||
|
||||
$(SRC_DIR)/rm: $(SRC_DIR)/rm.o $(SRC_DIR)/remove.o $(LIB_DIR)/libfettish.a
|
||||
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
|
||||
|
||||
$(SRC_DIR)/sha1sum: $(SRC_DIR)/sha1sum.o $(SRC_DIR)/md5sum.o $(LIB_DIR)/libfettish.a
|
||||
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
|
||||
|
||||
install: $(ALL)
|
||||
$(SRC_DIR)/install -d $(bindir)
|
||||
$(SRC_DIR)/install $^ $(bindir)
|
||||
Loading…
Add table
Add a link
Reference in a new issue