From e50b70137e665723e288cd18cc06ac80a753eba9 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 18 Apr 2026 10:25:05 -0500 Subject: [PATCH] chore (coreboot-utils): use %conf (#11293) (#11481) --- anda/tools/coreboot-utils/coreboot-utils.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/anda/tools/coreboot-utils/coreboot-utils.spec b/anda/tools/coreboot-utils/coreboot-utils.spec index 4a6b0c8aad..083f66b658 100644 --- a/anda/tools/coreboot-utils/coreboot-utils.spec +++ b/anda/tools/coreboot-utils/coreboot-utils.spec @@ -499,6 +499,13 @@ Requires: coreboot-utils = %{evr} %patch -P0 -p1 %patch -P1 -p1 +%conf +%ifarch x86_64 +pushd msrtool +%configure +popd +%endif + %build %if 0%{?fedora} >= 42 export CC=gcc-14 @@ -534,6 +541,9 @@ pushd util %endif %make_build -C kbc1126 %ifarch x86_64 +%make_build -C msrtool +%endif +%ifarch x86_64 %make_build -C nvramtool LDFLAGS="-fPIE" %endif %ifarch x86_64 @@ -557,13 +567,6 @@ export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readon %gobuild -o %{_builddir}/autoport popd -%ifarch x86_64 -pushd msrtool -%configure -%make_build -popd -%endif - pushd coreboot-configurator %meson %meson_build