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.
2026-03-09 12:55:23 +01:00 · 2023-11-07 10:51:23 +11:00 · 2023-11-07 10:51:23 +11:00 · 6ed2e09f3a
commit 6ed2e09f3a
parent 0907cfd073
546 changed files with 700 additions and 1299 deletions
--- a/steps/bash-2.05b/mk/builtins.mk
+++ b/steps/bash-2.05b/mk/builtins.mk
@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+.SUFFIXES = .def
+
+include ../common.mk
+
+CFLAGS  = \
+	-I. \
+	-I.. \
+	-I../include \
+	-I../lib \
+	$(COMMON_CFLAGS)
+
+BUILTINS_DEFS = $(addsuffix .def, $(BUILTINS_DEF_FILES))
+BUILTINS_DEF_OBJS = $(addsuffix .o, $(BUILTINS_DEF_FILES))
+BUILTINS_STATIC_FILES = common evalstring evalfile getopt bashgetopt
+BUILTINS_STATIC_OBJS = $(addsuffix .o, $(BUILTINS_STATIC_FILES))
+BUILTINS_OBJS = $(BUILTINS_DEF_OBJS) $(BUILTINS_STATIC_OBJS)
+
+%.o: %.def
+	../mkbuiltins $<
+	$(CC) -c $(CFLAGS) -o $@ $*.c
+
+libbuiltins.a: $(BUILTINS_OBJS) builtins.o
+	$(AR) cr $@ $^
--- a/steps/bash-2.05b/mk/common.mk
+++ b/steps/bash-2.05b/mk/common.mk
@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+CC      = tcc
+LD      = tcc
+AR      = tcc -ar
+
+COMMON_CFLAGS  = \
+	-DHAVE_DIRENT_H \
+	-DSTRUCT_DIRENT_HAS_D_INO \
+	-DHAVE_STDINT_H \
+	-DHAVE_LIMITS_H \
+	-DHAVE_STRING_H \
+	-DHAVE_INTTYPES_H \
+	-DRETSIGTYPE=void \
+	-DHUGE_VAL=10000000000.0 \
+	-DTERMIO_TTY_DRIVER \
+	-DPREFER_STDARG \
+	-DHAVE_DECL_STRTOL \
+	-DHAVE_DECL_STRTOLL \
+	-DHAVE_DECL_STRTOUL \
+	-DHAVE_DECL_STRTOULL \
+	-DHAVE_TZNAME \
+	-DPIPESIZE=4096 \
+	-DDEFAULT_PATH_VALUE=\"$(prefix)/bin\" \
+	-DSTANDARD_UTILS_PATH=\"$(prefix)/bin\" \
+	-DPPROMPT=\"$ \" \
+	-DSPROMPT=\"$ \" \
+	-DCONF_MACHTYPE=\"bootstrap\" \
+	-DGETGROUPS_T=int \
+	-DCOND_COMMAND \
+	-DCONF_HOSTTYPE=\"i386\" \
+	-DCONF_OSTYPE=\"linux\" \
+	-DDEFAULT_MAIL_DIRECTORY=\"/fake-mail\" \
+	-DVOID_SIGHANDLER \
+	-DDISTVERSION=\"2.05b\" \
+	-DBUILDVERSION=\"0\" \
+	-DSCCSVERSION=\"2.05b\" \
+	-DLC_ALL=\"C\" \
+	-DHAVE_STRERROR \
+	-DHAVE_MEMSET \
+	-DHAVE_DUP2 \
+	-DHAVE_STRTOUL \
+	-DHAVE_STRTOULL \
+	-DHAVE_STRCHR \
+	-DHAVE_BCOPY \
+	-DHAVE_BZERO \
+	-DHAVE_POSIX_SIGNALS \
+	-DHAVE_GETCWD \
+	-DHAVE_SYS_SIGLIST \
+	-Dendpwent\(x\)=0 \
+	-Denable_hostname_completion\(on_or_off\)=0
+
+BUILTINS_DEF_FILES = alias bind break builtin cd colon command complete declare \
+	echo enable eval exec exit fc fg_bg hash history jobs kill let read return \
+	set setattr shift source suspend test times trap type ulimit umask wait \
+	getopts pushd shopt printf
--- a/steps/bash-2.05b/mk/main.mk
+++ b/steps/bash-2.05b/mk/main.mk
@ -0,0 +1,92 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+include common.mk
+
+CFLAGS  = \
+		  -I. \
+		  -Iinclude \
+		  -Ilib \
+		  -Ilib/sh \
+		  -Ibuiltins \
+		  $(COMMON_CFLAGS)
+
+LDFLAGS   = -L. -Lbuiltins -static
+LIBRARIES = libsh.a builtins/libbuiltins.a libglob.a libtilde.a
+
+SHLIB_FILES = clktck getcwd getenv oslib setlinebuf strcasecmp strerror strtod \
+	vprint itos rename zread zwrite shtty inet_aton netopen \
+	strpbrk timeval clock makepath pathcanon pathphys stringlist stringvec \
+	tmpfile spell strtrans strindex shquote snprintf mailstat fmtulong \
+	fmtullong strtoll strtoull strtoimax strtoumax fmtumax netconn mktime \
+	strftime xstrchr zcatfd
+# FIXME: for some reason these don't get picked up correctly in the
+# final linking cmd
+SHLIB_ODD_FILES = zcatfd strtoumax spell pathphys
+SHLIB_OBJS = $(addprefix lib/sh/, $(addsuffix .o, $(SHLIB_FILES)))
+SHLIB_ODD_OBJS = $(addprefix lib/sh/, $(addsuffix .o, $(SHLIB_ODD_FILES)))
+
+MKBUILTINS_OBJS = builtins/mkbuiltins.o
+BUILTINS_DEFS = $(addprefix builtins/, $(addsuffix .def, $(BUILTINS_DEF_FILES)))
+
+GLOB_FILES = glob strmatch smatch xmbsrtowcs
+GLOB_OBJS = $(addprefix lib/glob/, $(addsuffix .o, $(GLOB_FILES)))
+
+TILDE_OBJS = lib/tilde/tilde.o
+
+MKSYNTAX_OBJS = mksyntax.o
+MKSIGNAMES_OBJS = support/mksignames.o
+
+FILES = shell eval y.tab general make_cmd print_cmd dispose_cmd execute_cmd \
+	variables copy_cmd error expr flags nojobs subst hashcmd hashlib mailcheck \
+	trap input unwind_prot pathexp sig test version alias array arrayfunc \
+	braces bracecomp bashhist bashline list stringlib locale findcmd redir \
+	pcomplete pcomplib syntax xmalloc siglist
+OBJS = $(addsuffix .o, $(FILES))
+
+all: bash
+
+# Builtins
+
+mkbuiltins: $(MKBUILTINS_OBJS)
+	$(CC) $(CFLAGS) $(MKBUILTINS_OBJS) $(LDFLAGS) -o $@
+	./mkbuiltins -externfile builtins/builtext.h -structfile builtins/builtins.c -noproduction $(BUILTINS_DEFS)
+
+# libsh
+
+libsh.a: $(SHLIB_OBJS)
+	$(AR) cr $@ $^
+
+# libglob
+
+libglob.a: $(GLOB_OBJS)
+	$(AR) cr $@ $^
+
+# libtilde
+
+libtilde.a: $(TILDE_OBJS)
+	$(AR) cr $@ $^
+
+# The actual program
+
+mksyntax: $(MKSYNTAX_OBJS)
+	$(CC) $^ $(LDFLAGS) -o $@ -lgetopt
+
+syntax.c: mksyntax
+	./mksyntax -o $@
+
+mksignames: $(MKSIGNAMES_OBJS)
+	$(CC) $^ $(LDFLAGS) -o $@ -lgetopt
+
+signames.h: mksignames
+	./mksignames $@
+
+y.tab.c: parse.y
+	yacc -d $^
+
+trap.c: signames.h
+
+bash: libsh.a libglob.a libtilde.a $(OBJS)
+	$(CC) -o bash $(LIBRARIES) $(OBJS) $(SHLIB_ODD_OBJS) $(LDFLAGS) -lsh -lbuiltins -lglob -ltilde