diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-09-18 21:04:00 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-09-20 13:53:33 +0100 |
| commit | 076c87ccf68f7fe5a3998e8cd8edd2033a2f2ef0 (patch) | |
| tree | 9aaf04cfa16565227f733b917af3e3c485505544 /config/module/memtest86plus/default | |
| parent | 387e6dd771588b7f8426c8d0934e610626730d51 (diff) | |
xbmk: make all projects multi-tree
we currently distinguish, by virtue of logic, multi-
and single-tree projects. this introduces a lot of
complexity, so the following patch has removed this
distinction. all single-tree projects are now multi
tree, but with only one tree.
other design changes:
config/git removed. rev/tree now handled with mkhelper
and target configs. this allows per-tree remote handling,
so we could (for example) add the mrchromebox coreboot
fork easily, for specific chromebook models.
config/project is now config/module/project. this
cleans up the main config/ directory.
cfgname variable: .config no longer hardcoded when
doing configs in projects. it is configurable with
this variable. if unset, the previous .cfg is used
noconfig variable: set this in target/mkhelper
configs, and config/module/project/tree/config/ is
unused; instead, make is called without config copying.
a "noconfig" placeholder is used. this enables cleaner
usage of previously single-tree projects in the new
multi-tree-only structure.
cfgvars: variables reinitialised in project config are
cleaned more reliably. in particular, several variables
e.g. autogenargs were not being reset between projects,
although the autogenargs variable is currently unused.
general cleanup has been conducted across the build
system, as part of this redesign. several parts of the
build system more over-engineered as a result of the
previous design, and the new design enabled a severe
reduction in sloccount (75 lines reduced in lbmk).
yes, this change *adds features* but there are fewer
lines of code than before. this is the best kind of
change. way better than the 3-line-diff. yes.
rev= and tree= are set more centrally in configs. the
mkhelper config can be used to set url/url_bkup, but
individual trees can override them.
configs have been cleaned up, with several variables
now much more heavily centralised. config/git/ was
used before to first download the bare repository, and
then the real clone was made with patches. this allows
git repositories to be cached for future re-builds.
with config/git/ gone, the download logic for projects
is more centrally implemented. a separate call to ./mk -f
is no longer performed, and in fact ./mk -f never needs
to be used anymore as a result. ./mk -f now is basically
the same thing as -b, just without any action performed.
this change will allow rapid expansion of the libreboot
project. i want to add hundreds of chromebooks to the
project, using mrchromebox, but the previous design did
not permit this. this change means that i can easily have
unlimited upstreams per project. coreboot will, in some
follow-up changes, have the following upstreams:
coreboot/default: coreboot.org
coreboot/fam15h: 15h.org fork
coreboot/chromebook: mrchromebox fork
this can now be done freely without massive changes to
the build system. under the previous design, i worked on
a now-abandoned patch to do N remotes per project, reading
repo links from a file. this meant that i'd have coreboot.org
first (main and backup), then mrchromebox. this meant that
lbmk would failover through to mrchromebox, wasting time
for the user.
this new design is much cleaner, and will enable the
project to be maintained much more easily.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'config/module/memtest86plus/default')
| -rw-r--r-- | config/module/memtest86plus/default/patches/0001-add-central-Makefile-in-main-directory.patch | 41 | ||||
| -rw-r--r-- | config/module/memtest86plus/default/target.cfg | 10 |
2 files changed, 51 insertions, 0 deletions
diff --git a/config/module/memtest86plus/default/patches/0001-add-central-Makefile-in-main-directory.patch b/config/module/memtest86plus/default/patches/0001-add-central-Makefile-in-main-directory.patch new file mode 100644 index 00000000..8291bfb8 --- /dev/null +++ b/config/module/memtest86plus/default/patches/0001-add-central-Makefile-in-main-directory.patch @@ -0,0 +1,41 @@ +From 81d850494c3cde1da33cc2df44837c839c1f2c60 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Fri, 6 Oct 2023 23:17:06 +0100 +Subject: [PATCH 1/1] add central Makefile in main directory + +it only does build64. i'm disabling use of 32-bit memtest in lbmk, +until i can figure out a more consistent cross-compile method, +rather than relying on hostcc. + +a user on irc reported build issues on pop os + +it's not pop's fault. lbmk needs to start handling cross +compilers properly. (alternatively, i could rig memtest86+ +to use crossgcc. i'll explore that later) + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + Makefile | 11 +++++++++++ + 1 file changed, 11 insertions(+) + create mode 100644 Makefile + +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..59fcbef +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,11 @@ ++# SPDX-License-Identifier: MIT ++# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org> ++ ++all: ++ make -C build64 ++ ++clean: ++ make -C build64 clean ++ ++distclean: ++ make -C build64 clean +-- +2.39.2 + diff --git a/config/module/memtest86plus/default/target.cfg b/config/module/memtest86plus/default/target.cfg new file mode 100644 index 00000000..8f57b322 --- /dev/null +++ b/config/module/memtest86plus/default/target.cfg @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +url="https://codeberg.org/libreboot/memtest86plus" +bkup_url="https://github.com/memtest86plus/memtest86plus.git" + +rev="5dcd424ea7afb857c1171e747ef064d98d26afeb" + +tree="default" + +noconfig="y" |
