From fc9dbef583cc5de551168c4c63eeb0558bf2b573 Mon Sep 17 00:00:00 2001
From: mrhh69 <122405954+mrhh69@users.noreply.github.com>
Date: Tue, 26 Nov 2024 22:22:40 +0000
Subject: [PATCH] testing/coreboot-tools: add -cbmem subpackage

---
 testing/coreboot-tools/APKBUILD | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/testing/coreboot-tools/APKBUILD b/testing/coreboot-tools/APKBUILD
index ba0fd5e109a..dc0617a9833 100644
--- a/testing/coreboot-tools/APKBUILD
+++ b/testing/coreboot-tools/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 pkgname=coreboot-tools
 pkgver=24.08
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools from the coreboot project"
 url="https://review.coreboot.org/coreboot"
 # coreboot only runs on x86_64 and x86 systems
@@ -19,7 +19,7 @@ makedepends="
 	yaml-cpp-dev
 	zlib-dev
 	"
-subpackages="$pkgname-intelmetool $pkgname-ectool $pkgname-nvramtool $pkgname-nvramtool-doc:nvramtool_doc:noarch $pkgname-ifdtool $pkgname-configurator"
+subpackages="$pkgname-intelmetool $pkgname-ectool $pkgname-nvramtool $pkgname-nvramtool-doc:nvramtool_doc:noarch $pkgname-ifdtool $pkgname-cbmem $pkgname-configurator"
 source="
 https://coreboot.org/releases/coreboot-$pkgver.tar.xz
 "
@@ -31,6 +31,7 @@ build() {
 	make -e -C util/ectool
 	make -e -C util/nvramtool CFLAGS="$CFLAGS -I. -DCMOS_HAL=1"
 	make -e -C util/ifdtool
+	make -e -C util/cbmem
 	abuild-meson -Db_lto=true util/coreboot-configurator util/coreboot-configurator/output
 	meson compile -C util/coreboot-configurator/output
 }
@@ -40,6 +41,7 @@ package() {
 	make -e -C util/ectool PREFIX="$pkgdir/usr" install
 	make -e -C util/nvramtool PREFIX="$pkgdir/usr" install
 	make -e -C util/ifdtool PREFIX="$pkgdir/usr" install
+	make -e -C util/cbmem PREFIX="$pkgdir/usr" install
 }
 
 intelmetool() {
@@ -74,6 +76,12 @@ ifdtool() {
 	amove usr/bin/ifdtool
 }
 
+cbmem() {
+	pkgdesc="CBMEM parser to read e.g. timestamps and console log"
+
+	amove usr/sbin/cbmem
+}
+
 configurator() {
 	pkgdesc="Graphical NVRAMtool frontend"
 	DESTDIR="$subpkgdir" meson install --no-rebuild -C $builddir/util/coreboot-configurator/output