Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chipsec: 1.8.1 -> 1.10.6

Browse Source
This commit is contained in:
Alexandre Iooss
2023-05-14 10:12:47 +02:00
parent 491c395163
commit 1dd536c54c
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/security/chipsec/compile-ko.diff
View File

@@ -1,10 +1,10 @@
diff --git i/setup.py w/setup.py diff --git a/setup.py b/setup.py
index cfe2665..5795874 100755 index 3465765c..ae128922 100755
--- i/setup.py --- a/setup.py
+++ w/setup.py +++ b/setup.py
@@ -179,7 +179,7 @@ class build_ext(_build_ext): @@ -137,7 +137,7 @@ class build_ext(_build_ext):
driver_build_function = self._build_win_driver elif platform.system().lower() == "windows":
self._build_win_compression() driver_build_function = self._build_win_driver
- if not self.skip_driver: - if not self.skip_driver:
+ if True: + if True:

6
pkgs/tools/security/chipsec/default.nix
View File

@@ -10,7 +10,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "chipsec"; pname = "chipsec";
version = "1.8.1"; version = "1.10.6";
disabled = !stdenv.isLinux; disabled = !stdenv.isLinux;
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "chipsec"; owner = "chipsec";
repo = "chipsec"; repo = "chipsec";
rev = version; rev = version;
hash = "sha256-bK8wlwhP0pi8rOs8ysbSZ+0aZOaX4mckfH/p4OLGnes="; hash = "sha256-+pbFG1SmSO/cnt1e+kel7ereC0I1OCJKKsS0KaJDWdc=";
}; };
patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ]; patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ];
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
libelf libelf
nasm nasm
]; ] ++ lib.optionals withDriver kernel.moduleBuildDependencies;
nativeCheckInputs = with python3.pkgs; [ nativeCheckInputs = with python3.pkgs; [
distro distro

16
pkgs/tools/security/chipsec/ko-path.diff
View File

@@ -1,13 +1,13 @@
diff --git c/chipsec/helper/linux/linuxhelper.py i/chipsec/helper/linux/linuxhelper.py diff --git a/chipsec/helper/linux/linuxhelper.py b/chipsec/helper/linux/linuxhelper.py
index c51b5e6..4be05ea 100644 index 2fd65140..f3f26bcb 100644
--- c/chipsec/helper/linux/linuxhelper.py --- a/chipsec/helper/linux/linuxhelper.py
+++ i/chipsec/helper/linux/linuxhelper.py +++ b/chipsec/helper/linux/linuxhelper.py
@@ -152,7 +152,7 @@ class LinuxHelper(Helper): @@ -153,7 +153,7 @@ class LinuxHelper(Helper):
else: else:
a2 = "a2=0x{}".format(phys_mem_access_prot) a2 = f'a2=0x{phys_mem_access_prot}'
- driver_path = os.path.join(chipsec.file.get_main_dir(), "chipsec", "helper", "linux", "chipsec.ko" ) - driver_path = os.path.join(chipsec.file.get_main_dir(), "chipsec", "helper", "linux", "chipsec.ko")
+ driver_path = os.path.join(chipsec.file.get_main_dir(), "drivers", "linux", "chipsec.ko" ) + driver_path = os.path.join(chipsec.file.get_main_dir(), "drivers", "linux", "chipsec.ko")
if not os.path.exists(driver_path): if not os.path.exists(driver_path):
driver_path += ".xz" driver_path += ".xz"
if not os.path.exists(driver_path): if not os.path.exists(driver_path):