mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-10 13: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.
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
|
|
|
|
SPDX-License-Identifier: Artistic-1.0
|
|
|
|
Set some things that cannot be overriden in the perl Configure script to
|
|
generate with correct values for live-bootstrap.
|
|
|
|
NOTE: this patch CANNOT be applied to a non-live-bootstrap environment.
|
|
|
|
--- ../metaconfig-5.32.1~rc1/U/threads/archname.U 2022-02-27 21:30:03.155396204 +1100
|
|
+++ ../metaconfig-5.32.1~rc1/U/threads/archname.U 2022-02-27 21:30:49.392396204 +1100
|
|
@@ -79,7 +79,7 @@
|
|
?X: Very GCCian.
|
|
*) archname=`echo $targetarch|sed 's,^[^-]*-,,'` ;;
|
|
esac
|
|
-myarchname="$tarch"
|
|
+myarchname="i686-linux"
|
|
case "$archname" in
|
|
'') dflt="$tarch";;
|
|
*) dflt="$archname";;
|
|
--- ../metaconfig-5.32.1~rc1/U/modified/Oldconfig.U 2022-02-27 21:31:26.911396204 +1100
|
|
+++ ../metaconfig-5.32.1~rc1/U/modified/Oldconfig.U 2022-02-27 21:32:31.846396204 +1100
|
|
@@ -117,16 +117,13 @@
|
|
?X: on some machines to avoid the error message when uname is not found; e.g.
|
|
?X: old SUN-OS 3.2 would not execute hostname in (uname -a || hostname). Sigh!
|
|
?X: Now not using a subshell but instead $test.
|
|
-myuname=`$uname -a 2>/dev/null`
|
|
-$test -z "$myuname" && myuname=`hostname 2>/dev/null`
|
|
# Downcase everything to avoid ambiguity.
|
|
# Remove slashes and single quotes so we can use parts of this in
|
|
# directory and file names.
|
|
# Remove newlines so myuname is sane to use elsewhere.
|
|
# tr '[A-Z]' '[a-z]' would not work in EBCDIC
|
|
# because the A-Z/a-z are not consecutive.
|
|
-myuname=`echo $myuname | $sed -e "s,['/],,g" | \
|
|
- ./tr '[A-Z]' '[a-z]' | $tr $trnl ' '`
|
|
+myuname="linux (none) 4.9.10-gnu_1 #1 mon jan 1 00:00:01 1970 i686 gnulinux"
|
|
?X: Save the value we just computed to reset myuname after we get done here.
|
|
newmyuname="$myuname"
|
|
dflt=n
|
|
@@ -336,7 +333,7 @@
|
|
?X: Note the hostname on the second one, which will fool Configure
|
|
?X: into using the SysV case!
|
|
gnu) osname=gnu
|
|
- osvers="$3" ;;
|
|
+ osvers="4.9.10-gnu_1" ;;
|
|
?X: HP-UX uname -a gives something like
|
|
?X: HP-UX foobar B.10.20 A 9000/735 2016483812 two-user license
|
|
?X: Preserve the full 10.20 string instead of the previous plain '10'.
|