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,121 @@
#!/bin/sh
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
#
# SPDX-License-Identifier: GPL-3.0-or-later
../gnulib-901694b9/gnulib-tool --import --local-dir=gnulib-local \
--lib=libgnu \
--source-base=lib \
--m4-base=m4 \
--doc-base=doc \
--tests-base=tests \
--aux-dir=build-aux \
--lgpl=3 \
--conditional-dependencies \
--libtool \
--macro-prefix=gl \
--no-vc-files \
--avoid=lock \
--avoid=unistr/base \
--avoid=unistr/u8-mbtouc \
--avoid=unistr/u8-mbtouc-unsafe \
--avoid=unistr/u8-mbtoucr \
--avoid=unistr/u8-prev \
--avoid=unistr/u8-uctomb \
--avoid=unitypes \
accept4 \
alignof \
alloca-opt \
announce-gen \
autobuild \
bind \
byteswap \
c-strcase \
canonicalize-lgpl \
ceil \
clock-time \
close \
connect \
copysign \
dirfd \
dirname-lgpl \
duplocale \
environ \
extensions \
flexmember \
flock \
floor \
fpieee \
frexp \
fstat \
fsync \
full-read \
full-write \
func \
gendocs \
getaddrinfo \
getlogin \
getpeername \
getsockname \
getsockopt \
git-version-gen \
gitlog-to-changelog \
gnu-web-doc-update \
gnupload \
havelib \
iconv_open-utf \
inet_ntop \
inet_pton \
isfinite \
isinf \
isnan \
ldexp \
lib-symbol-versions \
lib-symbol-visibility \
libunistring \
link \
listen \
localcharset \
locale \
log1p \
lstat \
maintainer-makefile \
malloc-gnu \
malloca \
mkdir \
mkostemp \
nl_langinfo \
nproc \
nstrftime \
open \
pipe-posix \
pipe2 \
poll \
putenv \
readlink \
recv \
recvfrom \
regex \
rename \
rmdir \
select \
send \
sendto \
setenv \
setsockopt \
shutdown \
socket \
stat-time \
stdlib \
striconveh \
string \
sys_stat \
time \
times \
trunc \
unistd \
verify \
vsnprintf \
warnings \
wchar

View file

@ -0,0 +1,129 @@
#!/bin/sh
# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
#
# SPDX-License-Identifier: GPL-3.0-or-later
../gnulib-356a414e/gnulib-tool --import --local-dir=gnulib-local \
--lib=libgnu \
--source-base=lib \
--m4-base=m4 \
--doc-base=doc \
--tests-base=tests \
--aux-dir=build-aux \
--lgpl=3 \
--conditional-dependencies \
--libtool \
--macro-prefix=gl \
--no-vc-files \
--avoid=lock \
--avoid=unistr/base \
--avoid=unistr/u8-mbtouc \
--avoid=unistr/u8-mbtouc-unsafe \
--avoid=unistr/u8-mbtoucr \
--avoid=unistr/u8-prev \
--avoid=unistr/u8-uctomb \
--avoid=unitypes \
accept4 \
alignof \
alloca-opt \
announce-gen \
autobuild \
bind \
byteswap \
c-strcase \
canonicalize-lgpl \
ceil \
clock-time \
close \
connect \
copysign \
dirfd \
dirname-lgpl \
duplocale \
environ \
extensions \
flexmember \
flock \
floor \
fpieee \
frexp \
fstat \
fsync \
full-read \
full-write \
func \
gendocs \
getaddrinfo \
gethostname \
getlogin \
getpeername \
getsockname \
getsockopt \
git-version-gen \
gitlog-to-changelog \
gnu-web-doc-update \
gnupload \
havelib \
iconv_open-utf \
inet_ntop \
inet_pton \
isfinite \
isinf \
isnan \
ldexp \
lib-symbol-versions \
lib-symbol-visibility \
libunistring \
link \
listen \
localcharset \
locale \
log1p \
lstat \
maintainer-makefile \
malloc-gnu \
malloca \
mkdir \
mkostemp \
nl_langinfo \
nproc \
nstrftime \
open \
pipe-posix \
pipe2 \
poll \
posix_spawn \
posix_spawn_file_actions_addclose \
posix_spawn_file_actions_adddup2 \
posix_spawn_file_actions_addopen \
posix_spawn_file_actions_init \
posix_spawnp \
putenv \
readlink \
recv \
recvfrom \
regex \
rename \
rmdir \
select \
send \
sendto \
setenv \
setsockopt \
shutdown \
socket \
stat-time \
stdlib \
striconveh \
string \
sys_select \
sys_stat \
time \
times \
trunc \
unistd \
verify \
vsnprintf \
warnings \
wchar

90
steps/guile-3.0.9/pass1.sh Executable file
View file

@ -0,0 +1,90 @@
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2021 Michael Schierl <schierlm@gmx.de>
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
#
# SPDX-License-Identifier: GPL-3.0-or-later
# guile-psyntax-bootstrapping only supports Guile 3.0.7
# We need Guile 3.0.8 or later in order to have reproducible builds when
# parallelism (-jX) is enabled.
#
# To work around this issue, we;
# 1. run guile-psyntax-bootstrapping on Guile 3.0.7
# 2. take psyntax-pp.scm from Guile 3.0.7 and transplant into 3.0.9
# 3. compile guile 3.0.9
common_prepare() {
find . -name '*.info*' -delete
rm -r prebuilt/*/ice-9
# Remove buildstamp
sed -i "s/\`date -u +'%Y-%m-%d %T'.*\`/1970-01-01 00:00:00/" libguile/Makefile.am
autoreconf-2.71 -fi
}
src_prepare() {
# First, prepare Guile 3.0.7
cd ../guile-3.0.7
../../import-gnulib-3.0.7.sh
common_prepare
# pp-syntax bootstrap: remove pre-gen file
sha256sum module/ice-9/psyntax-pp.scm | tee psyntax-pp.sha256
rm module/ice-9/psyntax-pp.scm
## now let us prepare to rebuild it
echo '(primitive-load-path "psyntax-bootstrap/allsteps")' > module/ice-9/psyntax-pp.scm
mkdir -p module/psyntax-bootstrap
cp ../guile-psyntax-bootstrapping-guile-3.0.7/psyntax-bootstrap/*.scm module/psyntax-bootstrap
cd module/ice-9
cp psyntax.scm psyntax-patched.scm
patch <../../../guile-psyntax-bootstrapping-guile-3.0.7/stage2.patch
cd ../..
# Now, Guile 3.0.9
cd ../guile-3.0.9
default
../../import-gnulib.sh
common_prepare
}
src_configure() {
for d in . ../guile-3.0.7; do
pushd "${d}"
PKG_CONFIG_PATH="${LIBDIR}/pkgconfig" ./configure \
--prefix="${PREFIX}" \
--libdir="${LIBDIR}" \
--build=i386-unknown-linux-musl \
--disable-shared \
--disable-jit
popd
done
}
src_compile() {
# pp-syntax: rebuild
pushd ../guile-3.0.7
make config.h
make libguile/scmconfig.h
make .version
cd lib
make all
cd ../meta
make all
cd ../libguile
make all
cd ../module
make ice-9/psyntax-pp.scm.gen
cd ..
# Note that on 32-bit systems psyntax-pp is not identical to the original
# and some identifier names are different.
popd
# Transplant psyntax-pp.scm
cp -f ../guile-3.0.7/module/ice-9/psyntax-pp.scm module/ice-9/
# Now proceed with the build
default
}

View file

@ -0,0 +1,5 @@
https://mirrors.kernel.org/gnu/guile/guile-3.0.7.tar.xz f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7
https://mirrors.kernel.org/gnu/guile/guile-3.0.9.tar.xz 1a2625ac72b2366e95792f3fe758fd2df775b4044a90a4a9787326e66c0d750d
https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-901694b9.tar.gz f9aad85de1f41d57c9368d304020ffbf354a5e56db1297f022c3d12181134e56
https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-356a414e.tar.gz fc9973f1a9243fdc4b98d33d7704f3c71bfdc4c2ef96899b8f28cade7290a714
https://github.com/schierlm/guile-psyntax-bootstrapping/archive/refs/tags/guile-3.0.7.tar.gz 14cda9c416506dfadf60c14fc623ff01ef99b87564a78d0a29c5d17143c97609