Unverified Commit 652e2071 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #313431 from wegank/gnu-efi-bump 

gnu-efi: 3.0.15 -> 3.0.18
parents ffa3e11c 72a48916

pkgs/development/libraries/gnu-efi/default.nix

+7 −5
Original line number Diff line number Diff line 
{ lib, stdenv, buildPackages, fetchurl, pciutils

{ lib, stdenv, buildPackages, fetchFromGitHub, pciutils

, gitUpdater }:



stdenv.mkDerivation rec {

  pname = "gnu-efi";

  version = "3.0.15";

  version = "3.0.18";



  src = fetchurl {

    url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2";

    hash = "sha256-kxole5xcG6Zf9Rnxg3PEOKJoJfLbeGaxY+ltGxaPIOo=";

  src = fetchFromGitHub {

    owner = "ncroxon";

    repo = "gnu-efi";

    rev = version;

    hash = "sha256-xtiKglLXm9m4li/8tqbOsyM6ThwGhyu/g4kw5sC4URY=";

  };



  buildInputs = [ pciutils ];

pkgs/os-specific/linux/firmware/fwupd-efi/default.nix

+0 −8
Original line number Diff line number Diff line
@@ -19,14 +19,6 @@ stdenv.mkDerivation rec { 
    hash = "sha256-r9CAWirQgafK/y71vABM46AUe1OAFejsqWY0FxaxJg4=";

  };



  patches = [

    (fetchpatch {

      url = "https://github.com/fwupd/fwupd-efi/commit/26c6ec5c1e7765fb5dc6a4df511ab21ee6c6e67a.patch";

      revert = true;

      hash = "sha256-vTdYExd7OlrrZ/LhlEO1zcvpKzeT5OeOeosD8/LUkMg=";

    })

  ];



  nativeBuildInputs = [

    meson

    ninja

pkgs/tools/security/efitools/aarch64.patch

0 → 100644
+16 −0
Original line number Diff line number Diff line 
diff --git a/Make.rules b/Make.rules

index 903a5a4..59eca2f 100644

--- a/Make.rules

+++ b/Make.rules

@@ -51,11 +51,6 @@ ifeq ($(ARCH),arm)

   FORMAT = -O binary

 endif

 

-ifeq ($(ARCH),aarch64)

-  LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a

-  FORMAT = -O binary

-endif

-

 %.efi: %.so

 	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym \

 		   -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \

pkgs/tools/security/efitools/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec { 
    sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i";

  };



  # https://github.com/ncroxon/gnu-efi/issues/7#issuecomment-2122741592

  patches = [

    ./aarch64.patch

  ];



  postPatch = ''

    sed -i -e 's#/usr/include/efi#${gnu-efi}/include/efi/#g' Make.rules

    sed -i -e 's#/usr/lib64/gnuefi#${gnu-efi}/lib/#g' Make.rules