mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-04 10:25:25 +01:00
6ed2e09f3a
- 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.
31 lines
827 B
Diff
31 lines
827 B
Diff
SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
|
|
|
SPDX-License-Identifier: PSF-2.0
|
|
|
|
There is a cycle in the build process. graminit.h requires
|
|
parsetok.c to be built, but graminit.h is included in parsetok.c.
|
|
Luckily the cycle can be broken by just NOP-ing the logic from
|
|
graminit.h.
|
|
|
|
We apply this patch before regen-ing graminit.h and revert it
|
|
afterward.
|
|
|
|
--- Parser/parsetok.c 2022-10-09 20:22:15.431229996 +1100
|
|
+++ Parser/parsetok.c 2022-10-09 20:22:57.981822483 +1100
|
|
@@ -8,7 +8,6 @@
|
|
#include "parser.h"
|
|
#include "parsetok.h"
|
|
#include "errcode.h"
|
|
-#include "graminit.h"
|
|
|
|
int Py_TabcheckFlag;
|
|
|
|
@@ -239,7 +238,7 @@
|
|
err_ret->text = text;
|
|
}
|
|
} else if (tok->encoding != NULL) {
|
|
- node* r = PyNode_New(encoding_decl);
|
|
+ node* r = NULL;
|
|
if (!r) {
|
|
err_ret->error = E_NOMEM;
|
|
n = NULL;
|