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:
fosslinux 2023-11-07 10:51:23 +11:00
parent 0907cfd073
commit 6ed2e09f3a
546 changed files with 700 additions and 1299 deletions

View file

@ -0,0 +1 @@
79d7f5e9f4f735575a6a163023150017587a97c5f911d81fc91380cea8bb4362 /usr/bin/bash

View file

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

View file

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

View file

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

65
steps/bash-2.05b/pass1.kaem Executable file
View file

@ -0,0 +1,65 @@
#!/bin/sh
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
#
# SPDX-License-Identifier: GPL-3.0-or-later
set -ex
# Check tarball checksums
checksum-transcriber sources
sha256sum -c sources.SHA256SUM
mkdir build src
cd build
# Extract
cp ${DISTFILES}/${pkg}.tar.gz ../src/
gzip -d -f ../src/${pkg}.tar.gz
tar xf ../src/${pkg}.tar
rm -r ../src/
cd ${pkg}
cp ../../mk/main.mk Makefile
cp ../../mk/builtins.mk builtins/Makefile
cp ../../mk/common.mk common.mk
# Create various .h files
touch config.h
touch include/version.h
touch include/pipesize.h
rm y.tab.c y.tab.h
# Patch
patch -Np0 -i ../../patches/mes-libc.patch
patch -Np0 -i ../../patches/tinycc.patch
patch -Np0 -i ../../patches/missing-defines.patch
patch -Np0 -i ../../patches/locale.patch
patch -Np0 -i ../../patches/dev-tty.patch
# Compile
make mkbuiltins
cd builtins
make libbuiltins.a
cd ..
make
# Install
install bash ${PREFIX}/bin/
mkdir /bin/
ln -s ${PREFIX}/bin/bash /bin/bash
ln -s ${PREFIX}/bin/bash /bin/sh
ln -s ${PREFIX}/bin/bash ${PREFIX}/bin/sh
cd ../..
# Checksums
if match x${UPDATE_CHECKSUMS} xTrue; then
sha256sum -o ${pkg}.checksums \
/usr/bin/bash
install ${pkg}.checksums ${SRCDIR}
else
sha256sum -c ${pkg}.checksums
fi

53
steps/bash-2.05b/pass2.sh Executable file
View file

@ -0,0 +1,53 @@
# SPDX-FileCopyrightText: © 2023 fosslinux <fosslinux@aussies.space>
#
# SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() {
default
# Remove bison generated files
rm y.tab.c y.tab.h
# Skip documentation
mv doc/Makefile.in Makefile.in.doc
rm doc/*
mv Makefile.in.doc doc/Makefile.in
# Rebuild configure script
rm configure
autoconf-2.69
# avoid non-deterministic build:
printf '%s\n%s\n' \
'#!/bin/sh' \
'echo "#define PIPESIZE 65536"' >builtins/psize.sh
}
src_configure() {
# --build argument needed for reproducibility
# bash_cv_dev_stdin and bash_cv_dev_fd are also used to
# improve reproducibility because they make configure
# skip checking for /dev/{fd,stdin,stdout,stderr} (build
# output is affected by their availability otherwise).
# size is part of binutils and is not yet available.
CC=tcc LD=tcc AR="tcc -ar" SIZE=true ./configure --prefix="${PREFIX}" \
--without-bash-malloc \
--disable-nls \
--build=i386-linux-gnu \
--enable-static-link \
bash_cv_dev_stdin=absent \
bash_cv_dev_fd=whacky
}
src_compile() {
make -j1
}
src_install() {
install -D bash "${DESTDIR}${PREFIX}/bin/bash"
# Work around weird symlink bug
install bash "${DESTDIR}${PREFIX}/bin/sh"
# Needs special handling b/c is currently running - tar doesn't like this
rm -f "${PREFIX}/bin/bash" "${PREFIX}/bin/sh"
}

View file

@ -0,0 +1,19 @@
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: GPL-2.0-or-later
We do not have /dev at this stage of the bootstrap, including /dev/tty. For
some reason, bash has a fixation on /dev/tty, even though we are not
interactive. Removing this check entirely fixes this issue.
diff --color -ru shell.c
--- shell.c 2002-07-02 01:27:11.000000000 +1000
+++ shell.c 2021-01-16 11:23:36.407287955 +1100
@@ -342,8 +342,6 @@
# endif
#endif
- check_dev_tty ();
-
#ifdef __CYGWIN__
_cygwin32_check_tmp ();

View file

@ -0,0 +1,18 @@
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: GPL-2.0-or-later
tinycc's extern support is bad. i.e. these externs don't propagate through.
--- builtins/common.c 2021-01-15 21:32:56.938683418 +1100
+++ builtins/common.c 2021-01-15 21:34:09.102153806 +1100
@@ -46,6 +46,9 @@
#include "../flags.h"
#include "../jobs.h"
#include "../builtins.h"
+int num_shell_builtins;
+struct builtin *shell_builtins;
+struct builtin *current_builtin;
#include "../input.h"
#include "../execute_cmd.h"
#include "../trap.h"

View file

@ -0,0 +1,17 @@
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: GPL-2.0-or-later
mes libc + setting locale = not worky.
--- locale.c 2021-01-15 09:38:55.729307629 +1100
+++ locale.c 2021-01-15 11:19:01.929391346 +1100
@@ -190,7 +190,7 @@
set_lang (var, value)
char *var, *value;
{
- return ((lc_all == 0 || *lc_all == 0) ? setlocale (LC_ALL, value?value:"") != NULL : 0);
+ return 0;
}
/* Get the value of one of the locale variables (LC_MESSAGES, LC_CTYPE) */

View file

@ -0,0 +1,19 @@
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: GPL-2.0-or-later
mes libc does not have locale support...
diff --git lib/sh/snprintf.c lib/sh/snprintf.c
index 7669576..747aeba 100644
--- lib/sh/snprintf.c
+++ lib/sh/snprintf.c
@@ -376,7 +376,7 @@ static void xfree __P((void *));
if ((p)->flags & PF_STAR_P) \
(p)->precision = GETARG (int)
-#if defined (HAVE_LOCALE_H)
+#if 0
# define GETLOCALEDATA(d, t, g) \
do \
{ \

View file

@ -0,0 +1,29 @@
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: GPL-2.0-or-later
We don't actually want any of these things, which should really be hidden
behind the ifdefs given here to disable them when they are not being
used (as we do).
--- execute_cmd.c 2021-01-15 09:38:55.730307635 +1100
+++ execute_cmd.c 2021-01-15 09:43:41.046896754 +1100
@@ -286,12 +286,18 @@
{
if (currently_executing_command->type == cm_simple)
return currently_executing_command->value.Simple->line;
+#ifdef COND_COMMAND
else if (currently_executing_command->type == cm_cond)
return currently_executing_command->value.Cond->line;
+#endif
+#ifdef DPAREN_ARITHMETIC
else if (currently_executing_command->type == cm_arith)
return currently_executing_command->value.Arith->line;
+#endif
+#ifdef ARITH_FOR_COMMAND
else if (currently_executing_command->type == cm_arith_for)
return currently_executing_command->value.ArithFor->line;
+#endif
else
return line_number;
}

View file

@ -0,0 +1,24 @@
SPDX-FileCopyrightText: © 2023 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: GPL-2.0-or-later
We don't yet have the size command.
--- Makefile.in 2023-03-11 15:41:13.297307977 +1100
+++ Makefile.in 2023-03-11 15:43:51.677298993 +1100
@@ -471,7 +471,6 @@
$(RM) $@
$(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
ls -l $(Program)
- size $(Program)
.build: $(SOURCES) config.h Makefile version.h $(VERSPROG)
@echo
@@ -493,7 +492,6 @@
strip: $(Program) .made
strip $(Program)
ls -l $(Program)
- size $(Program)
lint:
${MAKE} ${MFLAGS} CFLAGS='${GCC_LINT_FLAGS}' .made

View file

@ -0,0 +1,30 @@
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: GPL-2.0-or-later
int name, namelen; is wrong for mes libc, it is char* name, so we modify tinycc
to reflect this.
diff --git lib/sh/oslib.c lib/sh/oslib.c
index 90d7be9..37fdf2a 100644
--- lib/sh/oslib.c
+++ lib/sh/oslib.c
@@ -192,8 +192,7 @@ bzero (s, n)
# include <sys/utsname.h>
int
gethostname (name, namelen)
- char *name;
- int namelen;
+ char *name; int namelen;
{
int i;
struct utsname ut;
@@ -209,7 +208,7 @@ gethostname (name, namelen)
# else /* !HAVE_UNAME */
int
gethostname (name, namelen)
- int name, namelen;
+ char* name; int namelen;
{
strncpy (name, "unknown", namelen);
name[namelen] = '\0';

1
steps/bash-2.05b/sources Normal file
View file

@ -0,0 +1 @@
https://mirrors.kernel.org/gnu/bash/bash-2.05b.tar.gz ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4