summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2026-09-10 18:05:57 +0100
committerLeah Rowe <leah@libreboot.org>2026-09-10 18:05:57 +0100
commit8822c5681578dba7a0cbcf6df8a71c2da1301074 (patch)
treeb023005282923fcea799ac1e32218f5f95ff0bf2
parentbb0221252c78f2dd7a5eeed45091baa79f7029ab (diff)
mk: make it completely generic
commands now fed from a file, include/common.sh which in turn also includes other lib files this makes mk completely generic, and means that changes will now be completely in sync with cbmk, ensuring a lack of merge conflicts, though the file was already pretty small anyway. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rw-r--r--include/common.sh19
-rwxr-xr-xmk13
2 files changed, 21 insertions, 11 deletions
diff --git a/include/common.sh b/include/common.sh
new file mode 100644
index 00000000..89a42073
--- /dev/null
+++ b/include/common.sh
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+. "include/lib.sh"
+. "include/init.sh"
+. "include/vendor.sh"
+. "include/mrc.sh"
+. "include/inject.sh"
+. "include/rom.sh"
+. "include/release.sh"
+. "include/get.sh"
+. "include/chromebook.sh"
+
+xbcommands=" \
+version \
+release \
+download \
+inject \
+prep_mr_import \
+"
diff --git a/mk b/mk
index b0a7280a..e99b8f71 100755
--- a/mk
+++ b/mk
@@ -23,15 +23,7 @@ xbcddir="${xbcddir%/*}"
cd "$xbcddir" || exit 1
-. "include/lib.sh"
-. "include/init.sh"
-. "include/vendor.sh"
-. "include/mrc.sh"
-. "include/inject.sh"
-. "include/rom.sh"
-. "include/release.sh"
-. "include/get.sh"
-. "include/chromebook.sh"
+. "include/common.sh"
main()
{
@@ -41,8 +33,7 @@ main()
shift 1
fi
- if ! xeq main "$cmd" \
- version release download inject prep_mr_import; then
+ if ! xeq main "$cmd" $xbcommands; then
return 0
fi