Skip to content

Commit b591705

Browse files
authored
Merge pull request #371 from eduardosm/sysabc-refs
Update `parts.rst` to remove remaining references to sysa/sysb/sysc
2 parents c1a1ef6 + c42dd53 commit b591705

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

parts.rst

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -747,15 +747,16 @@ kexec-linux
747747
===========
748748

749749
If the kernel bootstrap option is enabled then a C program ``kexec-linux`` is compiled.
750-
This can be used to launch a Linux kernel from Fiwix.
750+
This can be used to launch a Linux kernel from Fiwix (when not using ``--kernel``).
751751

752752
kexec-tools 2.0.22
753753
==================
754754

755755
``kexec`` is a utility for the Linux kernel that allows the re-execution of the
756756
Linux kernel without a manual restart from within a running system. It is a
757757
kind of soft-restart. It is only built for non-chroot mode, as we only use it
758-
in non-chroot mode. It is used to go into sysb/sysc.
758+
in non-chroot mode. It is used to boot the Linux kernel that will be built next
759+
from the current Linux kernel (when using ``--kernel``).
759760

760761
Linux kernel 4.9.10
761762
===================
@@ -767,7 +768,7 @@ However, the docs are also wrong, as the latest of the 4.9.x series does not
767768
work with our version of binutils. However, a much earlier 4.9.10 does
768769
(selected arbitrarily, could go newer but did not test), with a small amount
769770
of patching. This is also modern enough for most hardware and to cause few
770-
problems with software built in sysc. Secondly, the linux-libre scripts are used
771+
problems with software built afterwards. Secondly, the linux-libre scripts are used
771772
to deblob the kernel. Every other pregenerated file is appended with ``_shipped``
772773
so we use a ``find`` command to remove those, which are automatically regenerated.
773774
The kernel config was originally taken from Void Linux, and was then modified
@@ -778,11 +779,18 @@ subsequent systems, and we do not have ``modprobe``.
778779
We then kexec to use the new Linux kernel, using ``kexec-tools`` for a Linux
779780
kernel and ``kexec-linux`` for Fiwix.
780781

782+
musl 1.2.4
783+
==========
784+
785+
At this point, it is guaranteed that we are running on Linux with thread support,
786+
so we rebuild musl with thread support.
787+
781788
curl 7.88.1
782789
===========
783790

784791
``curl`` is used to download files using various protocols including HTTP and HTTPS.
785-
However, this first build does not support encrypted HTTPS yet.
792+
However, this first build does not support encrypted HTTPS yet. ``curl`` requires
793+
Linux and musl with thread support, which are now available.
786794

787795
bash 5.2.15
788796
===========
@@ -792,16 +800,6 @@ and is built with GNU readline support so it can be used as a fully-featured
792800
interactive shell. ``autoconf-2.69`` is used to regenerate the configure
793801
script and ``bison`` is used to recreate some included generated files.
794802

795-
curl 7.83.0
796-
===========
797-
798-
``curl`` is built in sysc because Linux must be running with support for threads
799-
(which is not the case if kernel bootstrapping is being used). curl requires
800-
musl with thread support, which was built at the end of sysa.
801-
``curl`` is built first in sysc so the rest of the packages can be downloaded.
802-
Note that the tar file for curl itself was copied over from sysa because
803-
curl is not yet available to download it.
804-
805803
xz 5.4.1
806804
========
807805

0 commit comments

Comments
 (0)