mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-17 16:55:25 +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
90
steps/guile-3.0.9/pass1.sh
Executable file
90
steps/guile-3.0.9/pass1.sh
Executable 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
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue