From 5946ae21e3f755c5fbae5f9e33e568b4f7dbb5ce Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Wed, 2 Apr 2025 23:09:54 -0500 Subject: [PATCH] Fix: cbfstool (#4231) * Fix: cbfstool * changelog --- anda/tools/cbfstool/cbfstool.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/anda/tools/cbfstool/cbfstool.spec b/anda/tools/cbfstool/cbfstool.spec index 196602f21f..ff103bfb22 100644 --- a/anda/tools/cbfstool/cbfstool.spec +++ b/anda/tools/cbfstool/cbfstool.spec @@ -4,7 +4,10 @@ Release: 1%?dist Summary: Management utility for CBFS formatted ROM images URL: https://doc.coreboot.org/lib/fw_config.html#cbfs License: GPLv2 -BuildRequires: gcc g++ gcc-gnat make cmake ncurses-devel iasl git +BuildRequires: gcc g++ gcc-gnat make cmake ncurses-devel iasl anda-srpm-macros +%if 0%{?fedora} >= 42 +BuildRequires: gcc14 gcc14-c++ +%endif Requires: glibc Packager: Owen Zimmerman @@ -12,17 +15,23 @@ Packager: Owen Zimmerman Management utility for CBFS formatted ROM images. %prep -git clone https://review.coreboot.org/coreboot.git -b %version +%git_clone https://review.coreboot.org/coreboot.git %build -make -C coreboot/util/cbfstool +%if 0%{?fedora} >= 42 +export CC=gcc-14 +export CXX=g++-14 +%endif +%make_build -C util/cbfstool %install -install -Dm 777 coreboot/util/cbfstool/cbfstool %buildroot%_bindir/cbfstool +install -Dm 777 util/cbfstool/cbfstool %buildroot%_bindir/cbfstool %files /usr/bin/cbfstool %changelog +* Wed Apr 02 2025 Owen Zimmerman +- Add macros and specify fedora version release exports * Sun Aug 25 2024 Owen Zimmerman -- Initial Package \ No newline at end of file +- Initial Package