pyrox.dev
Merge pull request #167571 from veehaitch/sgx-2.16
sgx-sdk, sgx-psw: 2.15.1 -> 2.16
+2
-23
pkgs/os-specific/linux/sgx/psw/default.nix
+2
-23
pkgs/os-specific/linux/sgx/psw/default.nix
···
28
28
hash = "sha256-JriA9UGYFkAPuCtRizk8RMM1YOYGR/eO9ILnx47A40s=";
29
29
};
30
30
dcap = rec {
31
-
version = "1.12.1";
31
+
version = "1.13";
32
32
filename = "prebuilt_dcap_${version}.tar.gz";
33
33
prebuilt = fetchurl {
34
34
url = "https://download.01.org/intel-sgx/sgx-dcap/${version}/linux/${filename}";
35
-
hash = "sha256-V/XHva9Sq3P36xSW+Sd0G6Dnk4H0ANO1Ns/u+FI1eGI=";
35
+
hash = "sha256-0kD6hxN8qZ/7/H99aboQx7Qg7ewmYPEexoU6nqczAik=";
36
36
};
37
37
};
38
38
in
···
64
64
];
65
65
66
66
postPatch = ''
67
-
# https://github.com/intel/linux-sgx/pull/730
68
-
substituteInPlace buildenv.mk --replace '/bin/cp' 'cp'
69
-
substituteInPlace psw/ae/aesm_service/source/CMakeLists.txt \
70
-
--replace '/usr/bin/getconf' 'getconf'
71
-
72
-
# https://github.com/intel/SGXDataCenterAttestationPrimitives/pull/205
73
-
substituteInPlace ./external/dcap_source/QuoteGeneration/buildenv.mk \
74
-
--replace '/bin/cp' 'cp'
75
-
substituteInPlace external/dcap_source/tools/SGXPlatformRegistration/Makefile \
76
-
--replace '/bin/cp' 'cp'
77
-
substituteInPlace external/dcap_source/tools/SGXPlatformRegistration/buildenv.mk \
78
-
--replace '/bin/cp' 'cp'
79
-
80
67
patchShebangs \
81
68
linux/installer/bin/build-installpkg.sh \
82
69
linux/installer/common/psw/createTarball.sh \
···
166
153
substituteInPlace $out/lib/systemd/system/remount-dev-exec.service \
167
154
--replace '/bin/mount' \
168
155
"${util-linux}/bin/mount"
169
-
170
-
header "Fixing linksgx.sh"
171
-
# https://github.com/intel/linux-sgx/pull/736
172
-
substituteInPlace $out/aesm/linksgx.sh \
173
-
--replace '/usr/bin/getent' \
174
-
'${glibc.bin}/bin/getent' \
175
-
--replace '/usr/sbin/usermod' \
176
-
'${shadow}/bin/usermod'
177
156
'';
178
157
179
158
passthru.tests = {
+3
-12
pkgs/os-specific/linux/sgx/sdk/default.nix
+3
-12
pkgs/os-specific/linux/sgx/sdk/default.nix
···
29
29
stdenv.mkDerivation rec {
30
30
pname = "sgx-sdk";
31
31
# Version as given in se_version.h
32
-
version = "2.15.101.1";
32
+
version = "2.16.100.4";
33
33
# Version as used in the Git tag
34
-
versionTag = "2.15.1";
34
+
versionTag = "2.16";
35
35
36
36
src = fetchFromGitHub {
37
37
owner = "intel";
38
38
repo = "linux-sgx";
39
39
rev = "sgx_${versionTag}";
40
-
hash = "sha256-e11COTR5eDPMB81aPRKatvIkAOeX+OZgnvn2utiv78M=";
40
+
hash = "sha256-qgXuJJWiqmcU11umCsE3DnlK4VryuTDAsNf53YPw6UY=";
41
41
fetchSubmodules = true;
42
42
};
43
43
···
53
53
url = "https://github.com/intel/linux-sgx/commit/254b58f922a6bd49c308a4f47f05f525305bd760.patch";
54
54
sha256 = "sha256-sHU++K7NJ+PdITx3y0PwstA9MVh10rj2vrLn01N9F4w=";
55
55
})
56
-
# Commit to add missing sgx_ippcp.h not yet part of this release
57
-
(fetchpatch {
58
-
name = "add-missing-sgx_ippcp-header.patch";
59
-
url = "https://github.com/intel/linux-sgx/commit/51d1087b707a47e18588da7bae23e5f686d44be6.patch";
60
-
sha256 = "sha256-RZC14H1oEuGp0zn8CySDPy1KNqP/POqb+KMYoQt2A7M=";
61
-
})
62
56
];
63
57
64
58
postPatch = ''
65
-
# https://github.com/intel/linux-sgx/pull/730
66
-
substituteInPlace buildenv.mk --replace '/bin/cp' 'cp'
67
-
68
59
patchShebangs linux/installer/bin/build-installpkg.sh \
69
60
linux/installer/common/sdk/createTarball.sh \
70
61
linux/installer/common/sdk/install.sh