mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-05 10:55:24 +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.
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
|
|
|
SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
Our older version of binutils doesn't play very nicely with binutils for a
|
|
couple of edgecase macros. It seems that ALTERNATIVE is one of these. As we
|
|
know what your system will be (not Xen), we can manually evaluate and write
|
|
out the ALTERNATIVEs.
|
|
|
|
--- arch/x86/entry/entry_32.S 2021-07-31 11:40:07.458032771 +1000
|
|
+++ arch/x86/entry/entry_32.S 2021-07-31 11:40:42.835298841 +1000
|
|
@@ -412,9 +412,8 @@
|
|
|
|
movl %esp, %eax
|
|
call do_fast_syscall_32
|
|
- /* XEN PV guests always use IRET path */
|
|
- ALTERNATIVE "testl %eax, %eax; jz .Lsyscall_32_done", \
|
|
- "jmp .Lsyscall_32_done", X86_FEATURE_XENPV
|
|
+ testl %eax, %eax
|
|
+ jz .Lsyscall_32_done
|
|
|
|
/* Opportunistic SYSEXIT */
|
|
TRACE_IRQS_ON /* User mode traces as IRQs on. */
|
|
--- arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:41:40.379731622 +1000
|
|
+++ arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:43:40.294633506 +1000
|
|
@@ -55,8 +55,6 @@
|
|
/* If SYSENTER (Intel) or SYSCALL32 (AMD) is available, use it. */
|
|
ALTERNATIVE_2 "", SYSENTER_SEQUENCE, X86_FEATURE_SYSENTER32, \
|
|
SYSCALL_SEQUENCE, X86_FEATURE_SYSCALL32
|
|
-#else
|
|
- ALTERNATIVE "", SYSENTER_SEQUENCE, X86_FEATURE_SEP
|
|
#endif
|
|
|
|
/* Enter using int $0x80 */
|