From 3d2319774da696066da51b66cae86ae5c9bd8721f4c6869ceac6edd3a522ba07 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 16 May 2022 12:45:23 +0000 Subject: [PATCH] Accepting request 977519 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/977519 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=166 --- u-boot.changes | 6 ++++++ u-boot.spec | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/u-boot.changes b/u-boot.changes index 204ab90..c90bd50 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 16 11:04:46 UTC 2022 - Andreas Schwab + +- Remove build dependency on SDL, none of the installed tools need that +- Use pkgconfig dependencies for gnutls, uuid, openssl + ------------------------------------------------------------------- Fri Apr 15 16:42:49 UTC 2022 - Frank Kunz diff --git a/u-boot.spec b/u-boot.spec index bc75084..1fae94a 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -243,18 +243,17 @@ BuildRequires: bc BuildRequires: bison # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 -# gnutls/gnutls.h required for tools/mkeficapsule.c -BuildRequires: libgnutls-devel BuildRequires: flex -# u-boot-clearfog (tools/kwbimage.c) needs openssl to build -BuildRequires: libopenssl-devel -# uuid/uuid.h required for tools/mkeficapsule.c -BuildRequires: libuuid-devel BuildRequires: pkgconfig +# gnutls/gnutls.h required for tools/mkeficapsule.c +BuildRequires: pkgconfig(gnutls) +# u-boot-clearfog (tools/kwbimage.c) needs openssl to build +BuildRequires: pkgconfig(openssl) +# uuid/uuid.h required for tools/mkeficapsule.c +BuildRequires: pkgconfig(uuid) BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: swig -BuildRequires: pkgconfig(sdl) Conflicts: u-boot-loader Provides: u-boot-loader %if "%_project" == "hardware:boot" || "%_project" == "hardware:boot:staging" || "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:RISCV" || "%_project" == "openSUSE:Leap:15.2" || "%_project" == "openSUSE:Leap:15.2:ARM" || "%_project" == "openSUSE:Leap:15.2:PowerPC" @@ -391,7 +390,7 @@ This package contains documentation for U-Boot firmware. # needed for include/config/auto.conf make defconfig make syncconfig -make %{?_smp_mflags} CFLAGS="%{optflags}" tools-only +make %{?_smp_mflags} CFLAGS="%{optflags}" tools-only NO_SDL=y %else %if 0%{?is_a64} || 0%{?is_h5}