mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-08 12:25:23 +01:00
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:
parent
0907cfd073
commit
6ed2e09f3a
546 changed files with 700 additions and 1299 deletions
3891
steps/linux-4.9.10/files/config
Normal file
3891
steps/linux-4.9.10/files/config
Normal file
File diff suppressed because it is too large
Load diff
68
steps/linux-4.9.10/pass1.sh
Normal file
68
steps/linux-4.9.10/pass1.sh
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
|
||||
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# XXX: Fix package after builder-hex0
|
||||
|
||||
src_unpack() {
|
||||
# Remove all previous source tarballs
|
||||
mkdir /tmp/keep
|
||||
for keep in deblob-4.9 ${pkg}.tar.gz musl-1.2.4.tar.gz curl-7.88.1.tar.bz2; do
|
||||
mv "${DISTFILES}/${keep}" /tmp/keep
|
||||
done
|
||||
rm -r "${DISTFILES}/"*
|
||||
mv /tmp/keep/* "${DISTFILES}"
|
||||
|
||||
mkdir "${pkg}"
|
||||
mv "${DISTFILES}/deblob-4.9" "${pkg}/"
|
||||
default || true # Predictable link errors - not a problem
|
||||
rm "${DISTFILES}/${pkg}.tar.gz"
|
||||
}
|
||||
|
||||
generate_autoconf_h() {
|
||||
# generate include/linux/autoconf.h -- we do not have gperf rn to do it the normal way
|
||||
mkdir -p include/generated
|
||||
# Transform each of the CONFIG_* options that are =y into header
|
||||
grep -E '=y$' .config | sed 's/=y$/ 1/' | sed 's/^/#define /' >> include/generated/autoconf.h
|
||||
# Transform each of the CONFIG_* options that are unset into headers
|
||||
grep -E ' is not set$' .config | sed 's/ is not set$//' | sed 's/#/#undef/' >> include/generated/autoconf.h
|
||||
# Transform each of the non-boolean options into headers
|
||||
grep -E '=.*$' .config | grep -v -E '=y$' | sed 's/=/ /' | sed 's/^/#define /' >> include/generated/autoconf.h
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
mv config .config
|
||||
mkdir -p include/config
|
||||
cp .config include/config/auto.conf
|
||||
|
||||
generate_autoconf_h
|
||||
|
||||
# Deblob the kernel
|
||||
chmod +x deblob-4.9
|
||||
./deblob-4.9 --force
|
||||
|
||||
# Remove shipped files
|
||||
find . -name "*_shipped*" -delete
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cp .config include/config/auto.conf
|
||||
rm include/generated/autoconf.h
|
||||
generate_autoconf_h
|
||||
|
||||
# Allow use of patched initramfs_list.sh (which is required anyway)
|
||||
make "${MAKEJOBS}" ARCH=i386 prepare
|
||||
PATH="${PWD}/usr:${PATH}" make "${MAKEJOBS}" ARCH=i386
|
||||
|
||||
# Clear up more space
|
||||
find . -name '*.o' -delete
|
||||
}
|
||||
|
||||
src_install() {
|
||||
install -D -m 644 arch/i386/boot/bzImage "/boot/linux-4.9.10"
|
||||
install -D -m 755 usr/gen_init_cpio "${PREFIX}/bin/gen_init_cpio"
|
||||
install -D -m 755 scripts/gen_initramfs_list.sh "${PREFIX}/bin/gen_initramfs_list.sh"
|
||||
}
|
||||
18
steps/linux-4.9.10/patches/bad-asm.patch
Normal file
18
steps/linux-4.9.10/patches/bad-asm.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
Remove the 68() which I'm not really sure what it does but still works and
|
||||
breaks our version of binutils.
|
||||
|
||||
--- arch/x86/boot/bioscall.S 2021-07-31 17:50:09.519480274 +1000
|
||||
+++ arch/x86/boot/bioscall.S 2021-07-31 18:21:32.086972277 +1000
|
||||
@@ -65,7 +65,7 @@
|
||||
movw %ax, %es
|
||||
|
||||
/* Copy output state from stack frame */
|
||||
- movw 68(%esp), %di /* Original %cx == 3rd argument */
|
||||
+ movw %sp, %di /* Original %cx == 3rd argument */
|
||||
andw %di, %di
|
||||
jz 4f
|
||||
movw %sp, %si
|
||||
22
steps/linux-4.9.10/patches/disable-broken-check.patch
Normal file
22
steps/linux-4.9.10/patches/disable-broken-check.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
There's something incorrect with this macro for live-bootstrap, most likely as
|
||||
a result of the dodgy installation of linux-headers. However, there is no
|
||||
problem with this, and it is verified that BITS_PER_LONG __BITS_PER_LONG
|
||||
have functional and correct values.
|
||||
|
||||
--- tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:26.616768608 +1000
|
||||
+++ tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:36.786847443 +1000
|
||||
@@ -9,10 +9,6 @@
|
||||
#define BITS_PER_LONG __WORDSIZE
|
||||
#endif
|
||||
|
||||
-#if BITS_PER_LONG != __BITS_PER_LONG
|
||||
-#error Inconsistent word size. Check asm/bitsperlong.h
|
||||
-#endif
|
||||
-
|
||||
#ifndef BITS_PER_LONG_LONG
|
||||
#define BITS_PER_LONG_LONG 64
|
||||
#endif
|
||||
17
steps/linux-4.9.10/patches/initramfs_list.patch
Normal file
17
steps/linux-4.9.10/patches/initramfs_list.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
Use gen_initramfs_list.sh from outside kernel source tree.
|
||||
|
||||
--- scripts/gen_initramfs_list.sh 2021-10-10 20:37:12.220231015 +1100
|
||||
+++ scripts/gen_initramfs_list.sh 2021-10-10 20:37:22.694296140 +1100
|
||||
@@ -310,7 +310,7 @@
|
||||
fi
|
||||
fi
|
||||
cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
|
||||
- usr/gen_init_cpio $timestamp ${cpio_list} > ${cpio_tfile}
|
||||
+ gen_init_cpio $timestamp ${cpio_list} > ${cpio_tfile}
|
||||
else
|
||||
cpio_tfile=${cpio_file}
|
||||
fi
|
||||
17
steps/linux-4.9.10/patches/linking.patch
Normal file
17
steps/linux-4.9.10/patches/linking.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
This seemingly useless statement (redefined a couple of lines later) is
|
||||
not liked by our version of binutils.
|
||||
|
||||
--- arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:45:14.787124887 +1000
|
||||
+++ arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:43:16.234180449 +1000
|
||||
@@ -170,7 +170,6 @@
|
||||
. = __vvar_beginning_hack + PAGE_SIZE;
|
||||
} :data
|
||||
|
||||
- . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
|
||||
|
||||
/* Init code and data - will be freed after init */
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
18
steps/linux-4.9.10/patches/regen.patch
Normal file
18
steps/linux-4.9.10/patches/regen.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
We do not use the _shipped version of the keymap generated using loadkeys.
|
||||
For some reason the makefile needs to be patched for this to work...
|
||||
|
||||
--- drivers/tty/vt/Makefile 2021-07-27 21:11:24.743104498 +1000
|
||||
+++ drivers/tty/vt/Makefile 2021-07-27 21:11:34.261186200 +1000
|
||||
@@ -22,7 +22,7 @@
|
||||
# Uncomment if you're changing the keymap and have an appropriate
|
||||
# loadkeys version for the map. By default, we'll use the shipped
|
||||
# versions.
|
||||
-# GENERATE_KEYMAP := 1
|
||||
+GENERATE_KEYMAP := 1
|
||||
|
||||
ifdef GENERATE_KEYMAP
|
||||
|
||||
34
steps/linux-4.9.10/patches/remove-alternative-asm.patch
Normal file
34
steps/linux-4.9.10/patches/remove-alternative-asm.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
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 */
|
||||
23
steps/linux-4.9.10/patches/remove-kconfig.patch
Normal file
23
steps/linux-4.9.10/patches/remove-kconfig.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
kconfig uses gperf, which we don't have at this stage. We manually generate
|
||||
everything (in the actual script) that is actually required within kconfig,
|
||||
and forgo everything that is not really required for the build.
|
||||
|
||||
--- Makefile 2021-07-30 21:25:43.577592065 +1000
|
||||
+++ Makefile 2021-07-30 21:26:40.349015612 +1000
|
||||
@@ -547,10 +547,10 @@
|
||||
export KBUILD_DEFCONFIG KBUILD_KCONFIG
|
||||
|
||||
config: scripts_basic outputmakefile FORCE
|
||||
- $(Q)$(MAKE) $(build)=scripts/kconfig $@
|
||||
+ $(Q)true
|
||||
|
||||
%config: scripts_basic outputmakefile FORCE
|
||||
- $(Q)$(MAKE) $(build)=scripts/kconfig $@
|
||||
+ true
|
||||
|
||||
else
|
||||
# ===========================================================================
|
||||
2
steps/linux-4.9.10/sources
Normal file
2
steps/linux-4.9.10/sources
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.10.tar.gz 97ff15f9550c6e85c25173b3cf5c7e89a2d39fb923112f2c8bc2729cf64bf6d8
|
||||
https://linux-libre.fsfla.org/pub/linux-libre/releases/old/gen6/4.9.10-gnu/deblob-4.9 af4214b851928a53ef470ed8729122b9db910a6c0769d5d46a5de0b3e96f74f3
|
||||
Loading…
Add table
Add a link
Reference in a new issue