Unverified Commit 3cfcacb6 authored by Jared Baur's avatar Jared Baur Committed by GitHub
Browse files

vboot_reference updates (#377663)

parents aee3b8cb 356c16f9

pkgs/by-name/vb/vboot_reference/package.nix

+10 −20
Original line number Diff line number Diff line
@@ -10,14 +10,13 @@ 
}:



stdenv.mkDerivation {

  version = "111.15329";



  pname = "vboot_reference";

  version = "135.16209";



  src = fetchFromGitiles {

    url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";

    rev = "1a1cb5c9a38030a5868e2aaad295c68432c680fd"; # refs/heads/release-R111-15329.B

    sha256 = "sha256-56/hqqFiKHw0/ah0D20U1ueIU2iq8I4Wn5DiEWxB9qA=";

    rev = "bf4b21294a1c2c6b94f400819d3fce4a905b3afe"; # refs/heads/release-R135-16209.B

    hash = "sha256-frg7NkK173wAHJRedtbJI5jI8Kee/VkByh5DCUzD9OA=";

  };



  nativeBuildInputs = [ pkg-config ];
@@ -30,22 +29,13 @@ stdenv.mkDerivation { 


  enableParallelBuilding = true;



  env.NIX_CFLAGS_COMPILE = toString [

    # This apparently doesn't work as expected:

    #  - https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R111-15329.B/Makefile#439

    # Let's apply the same flag manually.

    "-Wno-error=deprecated-declarations"

  ];



  postPatch = ''

    substituteInPlace Makefile \

      --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc'

      --replace-fail "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc'

    # Drop flag unrecognized by GCC 9 (for e.g. aarch64-linux)

    substituteInPlace Makefile \

      --replace "-Wno-unknown-warning" ""

  '';

      --replace-fail "-Wno-unknown-warning" ""



  preBuild = ''

    patchShebangs scripts

  '';
@@ -54,7 +44,7 @@ stdenv.mkDerivation { 
    "HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"

    "USE_FLASHROM=0"

    # Upstream has weird opinions about DESTDIR

    # https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R111-15329.B/Makefile#51

    # https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R135-16209.B/Makefile#51

    "UB_DIR=${placeholder "out"}/bin"

    "UL_DIR=${placeholder "out"}/lib"

    "UI_DIR=${placeholder "out"}/include/vboot"
@@ -66,10 +56,10 @@ stdenv.mkDerivation { 
    cp -r tests/devkeys* $out/share/vboot/

  '';



  meta = with lib; {

  meta = {

    description = "Chrome OS partitioning and kernel signing tools";

    license = licenses.bsd3;

    platforms = platforms.linux;

    maintainers = [ ];

    license = lib.licenses.bsd3;

    platforms = lib.platforms.linux;

    maintainers = [ lib.maintainers.jmbaur ];

  };

}