Compare commits

..

2 Commits

Author SHA1 Message Date
Owen Zimmerman 9338418c09 this actually
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2026-06-22 20:02:45 -05:00
Owen Zimmerman 319cf000ca fix: wails3
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2026-06-22 19:00:22 -05:00
2 changed files with 25 additions and 25 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
%global ver webview2/v1.0.25
%global sanitized_ver %(echo %{ver} | sed 's/-/~/g')
%global sanitized_ver %(echo %{ver} | sed 's|.*/||')
%global goipath github.com/wailsapp/wails/v3
Version: %{sanitized_ver}
+24 -24
View File
@@ -1,3 +1,5 @@
%define debug_package %nil
Name: coreboot-utils
Version: 26.06
Release: 1%{?dist}
@@ -30,7 +32,6 @@ BuildRequires: glibc-devel
BuildRequires: ncurses-devel
BuildRequires: libfl-devel
BuildRequires: pciutils-devel
BuildRequires: zlib-ng-devel
BuildRequires: libxcrypt-devel
BuildRequires: yaml-cpp-devel
BuildRequires: openssl-devel
@@ -44,6 +45,10 @@ BuildRequires: acpica-tools
BuildRequires: binutils
BuildRequires: python3
%if 0%{?fedora} >= 42
BuildRequires: gcc14 gcc14-c++
%endif
%description
%summary.
@@ -54,7 +59,7 @@ Requires: %{name}-abuild
Requires: %{name}-amdfwtool
Requires: %{name}-amdtools
Requires: %{name}-apcb
Requires: %{name}-archive
%dnl Requires: %{name}-archive
Requires: %{name}-autoport
Requires: %{name}-bincfg
Requires: %{name}-board_status
@@ -151,11 +156,11 @@ and GPIO selection pins.
apcb_edit - This tool allows patching an existing APCB binary with specific SPDs and GPIO selection pins.
apcb_v3_edit - This tool allows patching an existing APCB v3 binary with up to 16 specific SPDs.
%package archive
Requires: coreboot-utils = %{evr}
Summary: Concatenate files and create an archive
%description archive
%summary.
%dnl %package archive - ### Currently bugged and does not compile ###
%dnl Requires: coreboot-utils = %{evr}
%dnl Summary: Concatenate files and create an archive
%dnl %description archive
%dnl %summary.
%package autoport
Summary: Porting coreboot using autoport
@@ -496,19 +501,20 @@ Requires: coreboot-utils = %{evr}
%conf
%ifarch x86_64
pushd util/msrtool
pushd msrtool
%configure
popd
%endif
pushd util/coreboot-configurator
%meson
popd
%build
%if 0%{?fedora} >= 42
export CC=gcc-14
export CXX=g++-14
%endif
pushd util
%make_build -C amdfwtool LDFLAGS="-fPIE -lcrypto"
%make_build -C archive CFLAGS="-O2 -Wall -Wextra -Wshadow -Werror -Wno-nonnull"
%dnl %make_build -C archive # bugged upstream, does not build
%make_build -C bincfg
%ifarch x86_64
%make_build -C bucts LDFLAGS="-fPIE"
@@ -518,7 +524,7 @@ pushd util
%ifarch x86_64
%make_build -C ectool LDFLAGS="-fPIE"
%endif
%make_build -C futility CFLAGS="$CFLAGS -DEC_EFS=0"
%make_build -C futility
%make_build -C hda-decoder
%make_build -C ifdtool
%ifarch x86_64
@@ -528,7 +534,7 @@ pushd util
%make_build -C intelp2m
%endif
%ifarch x86_64
%make_build -C inteltool CFLAGS="-O2 -fkeep-inline-functions"
%make_build -C inteltool
%endif
%ifarch x86_64
%make_build -C intelvbttool
@@ -562,6 +568,7 @@ export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readon
popd
pushd coreboot-configurator
%meson
%meson_build
popd
popd
@@ -582,7 +589,7 @@ install -Dm 755 util/apcb/apcb_edit.py %{buildroot}%{_bindir}/apcb_edit.py
install -Dm 755 util/apcb/apcb_v3a_edit.py %{buildroot}%{_bindir}/apcb_v3a_edit.py
install -Dm 755 util/apcb/apcb_v3_edit.py %{buildroot}%{_bindir}/apcb_v3_edit.py
install -Dm 777 util/archive/archive %{buildroot}%{_bindir}/archive
%dnl install -Dm 777 util/archive/archive %{buildroot}%{_bindir}/archive
install -Dm 755 %{_builddir}/autoport %{buildroot}%{_bindir}/autoport
@@ -640,7 +647,7 @@ install -Dm 755 util/hda-decoder/hda-decoder %{buildroot}%{_bindir}/hda-decoder
install -Dm 755 util/ifdtool/ifdtool %{buildroot}%{_bindir}/ifdtool
%ifarch x86_64
install -Dm 755 util/intelmetool/build/intelmetool %{buildroot}%{_bindir}/intelmetool
install -Dm 755 util/intelmetool/intelmetool %{buildroot}%{_bindir}/intelmetool
%endif
%ifarch x86_64
@@ -843,10 +850,6 @@ cp Documentation/util/smmstoretool/index.md %{buildroot}%{_pkgdocdir}/smmstoreto
%doc util/apcb/README
%doc util/apcb/description.md
%files archive
%{_bindir}/archive
%doc util/archive/description.md
%files autoport
%{_bindir}/autoport
%doc util/autoport/*.md
@@ -1127,9 +1130,6 @@ cp Documentation/util/smmstoretool/index.md %{buildroot}%{_pkgdocdir}/smmstoreto
%doc util/xcompile/description.md
%changelog
* Mon Jun 22 2026 Owen Zimmerman <owen@fyralabs.com>
- Update for 26.06, build archive subpackage
* Sun Dec 28 2025 Owen Zimmerman <owen@fyralabs.com>
- Update macros, add %post symlinks