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,107 @@
SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: Python-2.0.1
unicodetype_db.h is a file that needs to be regened, but it not
particularly trivial to regen. For the first build of Python,
strip out any kind of unicode support that requires
unicodetype_db.h indiscriminately.
We are effectively restricted to ASCII characters with this change,
but it works.
--- Objects/unicodectype.c 2000-09-26 08:48:13.000000000 +1100
+++ Objects/unicodectype.c 2022-10-03 21:09:02.108869321 +1100
@@ -29,30 +29,12 @@
const unsigned char digit;
} _PyUnicode_TypeRecord;
-#include "unicodetype_db.h"
-
-static const _PyUnicode_TypeRecord *
-gettyperecord(int code)
-{
- int index;
-
- if (code < 0 || code >= 65536)
- index = 0;
- else {
- index = index1[(code>>SHIFT)];
- index = index2[(index<<SHIFT)+(code&((1<<SHIFT)-1))];
- }
- return &_PyUnicode_TypeRecords[index];
-}
-
/* Returns 1 for Unicode characters having the category 'Zl' or type
'B', 0 otherwise. */
int _PyUnicode_IsLinebreak(register const Py_UNICODE ch)
{
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
-
- return (ctype->flags & LINEBREAK_MASK) != 0;
+ return 0;
}
/* Returns the titlecase Unicode characters corresponding to ch or just
@@ -60,12 +44,7 @@
Py_UNICODE _PyUnicode_ToTitlecase(register const Py_UNICODE ch)
{
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
-
- if (ctype->title)
- return ch + ctype->title;
-
- return ch + ctype->upper;
+ return ch;
}
/* Returns 1 for Unicode characters having the category 'Lt', 0
@@ -73,9 +52,7 @@
int _PyUnicode_IsTitlecase(register const Py_UNICODE ch)
{
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
-
- return (ctype->flags & TITLE_MASK) != 0;
+ return 0;
}
/* Returns the integer decimal (0-9) for Unicode characters having
@@ -83,15 +60,13 @@
int _PyUnicode_ToDecimalDigit(register const Py_UNICODE ch)
{
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
-
- return (ctype->flags & DECIMAL_MASK) ? ctype->decimal : -1;
+ return -1;
}
int _PyUnicode_IsDecimalDigit(register const Py_UNICODE ch)
{
if (_PyUnicode_ToDecimalDigit(ch) < 0)
- return 0;
+ return 0;
return 1;
}
@@ -100,15 +75,13 @@
int _PyUnicode_ToDigit(register const Py_UNICODE ch)
{
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
-
- return (ctype->flags & DIGIT_MASK) ? ctype->digit : -1;
+ return -1;
}
int _PyUnicode_IsDigit(register const Py_UNICODE ch)
{
if (_PyUnicode_ToDigit(ch) < 0)
- return 0;
+ return 0;
return 1;
}

View file

@ -0,0 +1,45 @@
/*
* SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
*
* SPDX-License-Identifier: Python-2.0.1
*
* Reimplmentation of keyword.py main() in C, to break bootstrapping loop
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define MAX_LINE 128
int main() {
char filename[] = "Lib/keyword.py";
FILE *orig = fopen(filename, "r");
/* Read-write until starter line */
char *line = malloc(MAX_LINE);
do {
fgets(line, MAX_LINE, orig);
puts(line);
} while (strcmp(line, "#--start keywords--\n") != 0);
/* Perform the actual transformation */
while (fgets(line, MAX_LINE, stdin) != NULL) {
char *token = line;
while (*token != '"') token++;
token++;
/* Now at beginning of keyword */
char *end = token;
while (*end != '"') end++;
*end = '\0';
/* Write output line to stdout */
printf("'%s',\n", token);
/* For each line also advance orig pointer */
fgets(line, MAX_LINE, orig);
/* Cleanup */
free(line);
line = malloc(MAX_LINE);
}
/* Read-write until end */
while (fgets(line, MAX_LINE, orig) != NULL) {
puts(line);
}
}

View file

@ -0,0 +1,46 @@
/*
* SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
*
* SPDX-License-Identifier: Python-2.0.1
*
* Reimplmentation of token.py main() in C, to break bootstrapping loop
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define MAX_LINE 128
int main(int argc, char** argv) {
char *filename = argv[1];
FILE *orig = fopen(filename, "r");
/* Read-write until starter line */
char *line = malloc(MAX_LINE);
do {
fgets(line, MAX_LINE, orig);
puts(line);
} while (strcmp(line, "#--start constants--\n") != 0);
/* Perform the actual transformation */
while (fgets(line, MAX_LINE, stdin) != NULL) {
/* Transform input into output */
char *tokena = line + 8;
char *tokenb = strstr(tokena, "\t");
if (tokenb == 0) tokenb = strstr(tokena, " ");
*tokenb = '\0';
tokenb++;
while (*tokenb == '\t' || *tokenb == ' ') tokenb++;
/* Write output line to stdout */
printf("%s = %s", tokena, tokenb);
/* For each line also advance orig pointer */
fgets(line, MAX_LINE, orig);
/* Cleanup */
free(line);
line = malloc(MAX_LINE);
}
/* Read-write until end */
while (fgets(line, MAX_LINE, orig) != NULL) {
puts(line);
fflush(stdout);
}
}