Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tboot: 1.9.8 -> 1.10.1 #120486

Merged
merged 1 commit into from
Apr 27, 2021
Merged

tboot: 1.9.8 -> 1.10.1 #120486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 9 additions & 12 deletions pkgs/tools/security/tboot/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
{ lib, stdenv, fetchurl, trousers, openssl, zlib }:
{ lib, stdenv, fetchurl, openssl, perl, trousers, zlib }:

stdenv.mkDerivation rec {
pname = "tboot";
version = "1.9.8";
version = "1.10.1";

src = fetchurl {
url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
sha256 = "06f0ggl6vrb5ghklblvh2ixgmmjv31rkp1vfj9qm497iqwq9ac00";
sha256 = "18bnkwnlk16cc20nysqfcjx006idi7jmmhahk8vk09w458bhaajg";
};

patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ];

buildInputs = [ trousers openssl zlib ];
buildInputs = [ openssl trousers zlib ];

enableParallelBuilding = true;

hardeningDisable = [ "pic" "stackprotector" ];

NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
preConfigure = ''
substituteInPlace tboot/Makefile --replace /usr/bin/perl ${perl}/bin/perl
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't supply this with a configureFlag?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://sourceforge.net/p/tboot/code/ci/v1.10.1/tree/tboot/Makefile#l146

Is there a better way of fixing this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really. Is your solution working with cross compiling?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pkgsi686Linux.tboot builds.


configurePhase = ''
for a in lcptools utils tb_polgen; do
substituteInPlace $a/Makefile --replace /usr/sbin /sbin
for a in lcptools-v2 tb_polgen utils; do
substituteInPlace "$a/Makefile" --replace /usr/sbin /sbin
done
substituteInPlace docs/Makefile --replace /usr/share /share
'';
Expand All @@ -31,6 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM";
homepage = "https://sourceforge.net/projects/tboot/";
changelog = "https://sourceforge.net/p/tboot/code/ci/v${version}/tree/CHANGELOG";
license = licenses.bsd3;
maintainers = with maintainers; [ ak ];
platforms = [ "x86_64-linux" "i686-linux" ];
Expand Down
50 changes: 0 additions & 50 deletions pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch
View file
Open in desktop

This file was deleted.