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,135 @@
// SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
// SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
// SPDX-License-Identifier: GPL-3.0-or-later
#define MEM_ALIGNBYTES 8
#define BIN "/usr/bin"
#define BYTEORDER 0x4321
#define CPPSTDIN "tcc -E"
#define CPPMINUS "-"
#define HAS_ALARM
#define HAS_FORK
#define HAS_FCNTL
#define HAS_MKDIR
#define HAS_PAUSE
#define HAS_READDIR
#define HAS_RMDIR
#define HAS_STRERROR
#define HAS_SYS_ERRLIST
#define Strerror(e) strerror(e)
#define HAS_SYSCALL
#define HAS_TIMES
#define HAS_FLOCK
#define HAS_TRUNCATE
#define HAS_VPRINTF
#define Gid_t gid_t
#define I_DIRENT
#define Direntry_t struct dirent
#define I_DLFCN
#define I_FCNTL
#define I_GRP
#define I_LIMITS
#define I_MATH
#define I_NETINET_IN
#define I_PWD
#define I_STDDEF
#define I_STDLIB
#define I_STRING
#define I_SYS_DIR
#define I_SYS_IOCTL
#define I_SYS_PARAM
#define I_SYS_SELECT
#define I_SYS_STAT
#define I_SYS_TIMES
#define I_TERMIOS
#define I_TIME
#define I_UNISTD
#define I_UTIME
#define I_STDARG
#define INTSIZE 4
#define Off_t off_t
#define PRIVLIB "/usr/lib/perl5"
#define _(args) args
#define SCRIPTDIR "/usr/bin"
#define SIG_NAME "ZERO","HUP","INT","QUIT","ILL","TRAP","IOT","BUS","FPE","KILL","USR1","SEGV","USR2","PIPE","ALRM","TERM","STKFLT","CHLD","CONT","STOP","TSTP","TTIN","TTOU","URG","XCPU","XFSZ","VTALRM","PROF","WINCH", "IO", "POLL", "PWR", "SYS", "UNUSED", 0
#define SIG_NUM 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 0
#define Size_t size_t
#define STDCHAR char
#define Uid_t uid_t
#define LOC_SED "/usr/bin/sed"
#define ARCHLIB "/usr/lib/perl5/"
#define CAT2(a,b) a##b
#define STRINGIFY(a) "a"
#define Gconvert(x,n,t,b) gcvt((x),(n),(b))
#define Time_t time_t
#define SSize_t ssize_t
#define Sigjmp_buf sigjmp_buf
#define Sigsetjmp(buf,save_mask) setjmp(buf)
#define Siglongjmp(buf,retval) longjmp(buf,retval)
#define Signal_t void
#define OSNAME "linux"
#undef __DATE__ /* want reproducible build */
#define Malloc_t void *
#define Free_t void
#define SH_PATH "/bin/sh"
#define ARCHNAME "i386-linux"
#define BIN_EXP "/usr/bin"
#define NVSIZE 8 /* sizeof(double) */
#define UVSIZE 4 /* sizeof(long) on i386 */
#define IVSIZE 4
#define PTRSIZE 4
#define IVTYPE long
#define UVTYPE unsigned long
#define NVTYPE double
#define I8TYPE char
#define U8TYPE unsigned char
#define I16TYPE short
#define U16TYPE unsigned short
#define I32TYPE int
#define U32TYPE unsigned int
#define STDCHAR char
#define IVdf "ld"
#define UVuf "lu"
#define UVof "lo"
#define UVxf "lx"
#define UVXf "lX"
#define NVef "e"
#define NVff "f"
#define NVgf "g"
#define Mode_t mode_t
#define Off_t off_t
#define Pid_t pid_t
#define RANDBITS 48
#define seedDrand01(x) srand48((long)x)
#define Drand01() drand48()
#define Rand_seed_t long
#define Sock_size_t unsigned

View file

@ -0,0 +1,16 @@
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
# SPDX-License-Identifier: GPL-3.0-or-later
ar='tcc -ar'
cc='tcc'
ldlibpthname='LD_LIBRARY_PATH'
libpth='/usr/lib/i386-unknown-linux-musl'
path_sep=':'
archname=''
osvers=''
startperl='#!/usr/bin/perl'
perlpath='/usr/bin/perl'
CONFIGDOTSH=true

136
steps/perl-5.6.2/mk/main.mk Normal file
View file

@ -0,0 +1,136 @@
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
# SPDX-License-Identifier: GPL-3.0-or-later
VERSION=5.6.2
PRIVLIB_EXP=$(PREFIX)/lib/perl5/$(VERSION)
CC = tcc
AR = tcc -ar
CFLAGS = -DPRIVLIB_EXP=\"$(PRIVLIB_EXP)\" \
-DPERL_CORE=1 \
-I. \
-DVERSION=\"$(VERSION)\"
MINICFLAGS = -DPERL_EXTERNAL_GLOB
.PHONY: all
LIBPERL_SRC = av deb doio doop dump globals gv hv mg op perl perlapi perlio perly pp pp_ctl pp_hot pp_sys regcomp regexec run scope sv taint toke universal utf8 util xsutils
LIBPERL_OBJ = $(addsuffix .o, $(LIBPERL_SRC))
# POSIX is dealt with separately, Errno has no .a files either
EXTENSIONS = ByteLoader Data/Dumper Fcntl File/Glob IO
EXTENSIONS_A := $(foreach f,$(EXTENSIONS), lib/auto/$f/$(notdir $f).a)
EXTRA_EXTENSIONS = POSIX
EXTRA_EXTENSIONS_A = $(foreach f,$(EXTRA_EXTENSIONS), lib/auto/$f/$(notdir $f).a)
all: perl
op-mini.c: op.c
cp op.c op-mini.c
libperl.a: $(LIBPERL_OBJ)
$(AR) cr $@ $^
miniperl: miniperlmain.o op-mini.o libperl.a
$(CC) $(CFLAGS) $(MINICFLAGS) $^ $(LDFLAGS) -o $@
lib/re.pm:
cp ext/re/re.pm lib/re.pm
config.sh:
echo "CONFIGDOTSH=true" > $@
lib/Config.pm: config.sh miniperl configpm lib/re.pm
./miniperl configpm $@
autosplit.pl: lib/Config.pm
echo 'use AutoSplit; autosplit_lib_modules(@ARGV)' > $@
prepare_library: autosplit.pl miniperl lib/re.pm
./miniperl -Ilib $< lib/*.pm lib/*/*.pm
lib/ExtUtils/Miniperl.pm: miniperl
./miniperl minimod.pl > $@
writemain: writemain.SH config.sh
spitshell=cat eunicefix=true ./$<
perlmain.c: writemain
./writemain $(EXTENSIONS_A) $(EXTRA_EXTENSIONS_A) > $@
ext/DynaLoader/DynaLoader.pm: miniperl lib/Config.pm
./miniperl -Ilib ext/DynaLoader/DynaLoader_pm.PL DynaLoader.pm
mv DynaLoader.pm $@
$(MAKE) prepare_library
ext/DynaLoader/XSLoader.pm: miniperl lib/Config.pm
./miniperl -Ilib ext/DynaLoader/XSLoader_pm.PL XSLoader.pm
mv XSLoader.pm $@
ext/DynaLoader/DynaLoader.xs: ext/DynaLoader/DynaLoader.pm ext/DynaLoader/XSLoader.pm
cp ext/DynaLoader/dl_dlopen.xs $@
ext/DynaLoader/DynaLoader.c: ext/DynaLoader/DynaLoader.xs miniperl
cd $(dir $@); \
$(CURDIR)/miniperl -I$(CURDIR)/lib $(CURDIR)/lib/ExtUtils/xsubpp -noprototypes -typemap $(CURDIR)/lib/ExtUtils/typemap $(notdir $<) > $(notdir $@)
lib/auto/DynaLoader/DynaLoader.a: ext/DynaLoader/DynaLoader.o
mkdir -p lib/auto/DynaLoader
$(AR) cr $@ $^
ext/POSIX/POSIX.c: ext/POSIX/POSIX.xs miniperl
cd $(dir $@); \
$(CURDIR)/miniperl -I$(CURDIR)/lib $(CURDIR)/lib/ExtUtils/xsubpp -noprototypes -typemap $(CURDIR)/lib/ExtUtils/typemap $(notdir $<) > $(notdir $@)
lib/auto/POSIX/POSIX.a: ext/POSIX/POSIX.o
mkdir -p lib/auto/POSIX
$(AR) cr $@ $^
mkdir -p ext/POSIX/blib/lib
cp ext/POSIX/POSIX.pod ext/POSIX/POSIX.pm ext/POSIX/blib/lib
cd ext/POSIX/blib; \
../../../miniperl -I../../../lib $(CURDIR)/autosplit.pl lib/*.pm
cp ext/POSIX/blib/lib/auto/POSIX/* lib/auto/POSIX/
define build_rule
lib/auto/$1/$(notdir $1).a: ext/$1/$(notdir $1).o $(patsubst %.c,%.o,$(wildcard ext/$1/*.c))
mkdir -p lib/auto/$1
$(AR) cr lib/auto/$1/$(notdir $1).a ext/$1/$(notdir $1).o $(patsubst %.c,%.o,$(wildcard ext/$1/*.c))
cp ext/$1/$(notdir $1).pm lib/auto/$1/
ext/$1/$(notdir $1).c: ext/$1/$(notdir $1).xs miniperl lib/Config.pm
cd ext/$1; \
$(CURDIR)/miniperl -I$(CURDIR)/lib $(CURDIR)/lib/ExtUtils/xsubpp -noprototypes -typemap $(CURDIR)/lib/ExtUtils/typemap $(notdir $1).xs > $(notdir $1).c
endef
$(foreach f,$(EXTENSIONS),$(eval $(call build_rule,$f)))
lib/Errno.pm: miniperl
cd ext/Errno; \
../../miniperl -I../../lib Errno_pm.PL
mv ext/Errno/Errno.pm $@
perl: perlmain.o lib/auto/DynaLoader/DynaLoader.a $(EXTENSIONS_A) lib/auto/POSIX/POSIX.a libperl.a lib/re.pm lib/Errno.pm
$(CC) $(CFLAGS) perlmain.o lib/auto/DynaLoader/DynaLoader.a $(EXTENSIONS_A) lib/auto/POSIX/POSIX.a libperl.a -o $@
install: all
install -D perl $(DESTDIR)$(PREFIX)/bin/perl
mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)"
cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)"
install -m 644 ext/DynaLoader/XSLoader.pm "$(DESTDIR)$(PRIVLIB_EXP)"
install -m 644 ext/DynaLoader/DynaLoader.pm "$(DESTDIR)$(PRIVLIB_EXP)"
install -m 644 ext/ByteLoader/ByteLoader.pm "$(DESTDIR)$(PRIVLIB_EXP)"
mkdir "$(DESTDIR)$(PRIVLIB_EXP)/Data/"
install -m 644 ext/Data/Dumper/Dumper.pm "$(DESTDIR)$(PRIVLIB_EXP)/Data/"
install -m 644 ext/Fcntl/Fcntl.pm "$(DESTDIR)$(PRIVLIB_EXP)"
install -m 644 ext/File/Glob/Glob.pm "$(DESTDIR)$(PRIVLIB_EXP)/File/"
install -m 644 ext/IO/IO.pm "$(DESTDIR)$(PRIVLIB_EXP)"
mkdir "$(DESTDIR)$(PRIVLIB_EXP)/IO/"
cp ext/IO/lib/IO/*.pm "$(DESTDIR)$(PRIVLIB_EXP)/IO/"
install -m 644 ext/POSIX/POSIX.pm "$(DESTDIR)$(PRIVLIB_EXP)/"
install -m 644 ext/POSIX/POSIX.pod "$(DESTDIR)$(PRIVLIB_EXP)/"
cp lib/auto/POSIX/* "$(DESTDIR)$(PRIVLIB_EXP)/auto/POSIX/"

46
steps/perl-5.6.2/pass1.sh Executable file
View file

@ -0,0 +1,46 @@
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
#
# SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() {
default
# Regenerate bison files
sed -i '/yydestruct/d' perly.y
rm -f perly.c perly.h
bison -d perly.y
mv perly.tab.c perly.c
mv perly.tab.h perly.h
# Regenerate other prebuilt header files
for file in embed keywords opcode; do
rm -f ${file}.h
perl ${file}.pl
done
rm -f regnodes.h
perl regcomp.pl
rm -f ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c
perl bytecode.pl
rm -f warnings.h lib/warnings.pm
perl warnings.pl
# Workaround for some linking problems, remove if possible
sed -i 's/perl_call_method/Perl_call_method/' ext/Data/Dumper/Dumper.xs
sed -i 's/perl_call_sv/Perl_call_sv/' ext/Data/Dumper/Dumper.xs
sed -i 's/sv_setptrobj/Perl_sv_setref_iv/' ext/POSIX/POSIX.xs
# We are using non-standard locations
sed -i "s#/usr/include/errno.h#${PREFIX}/include/bits/errno.h#" ext/Errno/Errno_pm.PL
}
src_compile() {
make -j1 PREFIX="${PREFIX}"
}
src_install() {
# Remove old perl
rm -rf "${PREFIX}"/lib/perl5/
default
}

1
steps/perl-5.6.2/sources Normal file
View file

@ -0,0 +1 @@
https://www.cpan.org/src/5.0/perl-5.6.2.tar.gz a5e66f6ebf701b0567f569f57cae82abf5ce57af70a2b45ae71323b61f49134e