mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-02 01:18:08 +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
30
steps/kbd-1.15/pass1.sh
Executable file
30
steps/kbd-1.15/pass1.sh
Executable file
|
|
@ -0,0 +1,30 @@
|
|||
# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Remove flex/bison files
|
||||
rm src/loadkeys.c src/analyze.c
|
||||
|
||||
# Fix musl incompat
|
||||
sed -i -e 's/u_char/unsigned char/g' \
|
||||
-e 's/u_short/unsigned short/g' src/dumpkeys.c src/loadkeys.y
|
||||
|
||||
AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./configure --prefix="${PREFIX}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Missing dependency in Makefile
|
||||
flex -o src/analyze.c src/analyze.l
|
||||
make "${MAKEJOBS}" MAKEINFO=true
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make MAKEINFO=true DESTDIR="${DESTDIR}" install
|
||||
}
|
||||
16
steps/kbd-1.15/patches/fcntl.patch
Normal file
16
steps/kbd-1.15/patches/fcntl.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
Add missing fcntl header.
|
||||
|
||||
--- src/kbdrate.c 2021-07-22 22:35:53.671970814 +1000
|
||||
+++ src/kbdrate.c 2021-07-22 22:36:10.038096797 +1000
|
||||
@@ -94,6 +94,7 @@
|
||||
};
|
||||
|
||||
#include <signal.h>
|
||||
+#include <fcntl.h>
|
||||
|
||||
#include "nls.h"
|
||||
#include "version.h"
|
||||
34
steps/kbd-1.15/patches/resizecons.patch
Normal file
34
steps/kbd-1.15/patches/resizecons.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
Don't build resizecons (will not build in chroot).
|
||||
|
||||
--- src/Makefile.am 2022-02-26 14:11:22.577168053 +1100
|
||||
+++ src/Makefile.am 2022-02-26 14:11:34.641835790 +1100
|
||||
@@ -10,10 +10,6 @@
|
||||
PROGS += getkeycodes setkeycodes
|
||||
endif
|
||||
|
||||
-if RESIZECONS_PROGS
|
||||
-PROGS += resizecons
|
||||
-endif
|
||||
-
|
||||
if OPTIONAL_PROGS
|
||||
PROGS += \
|
||||
screendump setlogcons setvesablank spawn_console spawn_login \
|
||||
--- configure.ac 2022-02-26 14:10:50.047367229 +1100
|
||||
+++ configure.ac 2022-02-26 14:11:15.310765839 +1100
|
||||
@@ -53,12 +53,6 @@
|
||||
esac
|
||||
AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes")
|
||||
|
||||
-case $host_cpu in
|
||||
- i?86*) RESIZECONS_PROGS=yes ;;
|
||||
- *) RESIZECONS_PROGS=no ;;
|
||||
-esac
|
||||
-AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")
|
||||
-
|
||||
AC_ARG_ENABLE(optional-progs,
|
||||
AS_HELP_STRING(--enable-optional-progs, [Build and install a optional programs]),
|
||||
[OPTIONAL_PROGS=$enableval],[OPTIONAL_PROGS=no])
|
||||
1
steps/kbd-1.15/sources
Normal file
1
steps/kbd-1.15/sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
https://mirrors.edge.kernel.org/pub/linux/utils/kbd/kbd-1.15.tar.gz 203c93e004ac7ad0e50423ff54d89e40fa99f45b207b2b892a4d70211feebe05
|
||||
Loading…
Add table
Add a link
Reference in a new issue