Unverified Commit c6ef6dbc authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #231806 from erdnaxe/chipsec-fix 

chipsec: 1.8.1 -> 1.10.6; unbreak
parents c5445c0f eae5f836

pkgs/tools/security/chipsec/compile-ko.diff

+7 −7
Original line number Diff line number Diff line 
diff --git i/setup.py w/setup.py

index cfe2665..5795874 100755

--- i/setup.py

+++ w/setup.py

@@ -179,7 +179,7 @@ class build_ext(_build_ext):

diff --git a/setup.py b/setup.py

index 3465765c..ae128922 100755

--- a/setup.py

+++ b/setup.py

@@ -137,7 +137,7 @@ class build_ext(_build_ext):

         elif platform.system().lower() == "windows":

             driver_build_function = self._build_win_driver

             self._build_win_compression()

 

-        if not self.skip_driver:

+        if True:

pkgs/tools/security/chipsec/default.nix

+6 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "chipsec";

  version = "1.8.1";

  version = "1.10.6";



  disabled = !stdenv.isLinux;
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { 
    owner = "chipsec";

    repo = "chipsec";

    rev = version;

    hash = "sha256-bK8wlwhP0pi8rOs8ysbSZ+0aZOaX4mckfH/p4OLGnes=";

    hash = "sha256-+pbFG1SmSO/cnt1e+kel7ereC0I1OCJKKsS0KaJDWdc=";

  };



  patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ];
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { 
  nativeBuildInputs = [

    libelf

    nasm

  ];

  ] ++ lib.optionals withDriver kernel.moduleBuildDependencies;



  nativeCheckInputs = with python3.pkgs; [

    distro
@@ -72,7 +72,9 @@ python3.pkgs.buildPythonApplication rec { 
    '';

    license = licenses.gpl2Only;

    homepage = "https://github.com/chipsec/chipsec";

    maintainers = with maintainers; [ johnazoidberg ];

    maintainers = with maintainers; [ johnazoidberg erdnaxe ];

    platforms = [ "x86_64-linux" ] ++ lib.optional (!withDriver) "x86_64-darwin";

    # https://github.com/chipsec/chipsec/issues/1793

    broken = withDriver && kernel.kernelOlder "5.4" && kernel.isHardened;

  };

}

pkgs/tools/security/chipsec/ko-path.diff

+8 −8
Original line number Diff line number Diff line 
diff --git c/chipsec/helper/linux/linuxhelper.py i/chipsec/helper/linux/linuxhelper.py

index c51b5e6..4be05ea 100644

--- c/chipsec/helper/linux/linuxhelper.py

+++ i/chipsec/helper/linux/linuxhelper.py

@@ -152,7 +152,7 @@ class LinuxHelper(Helper):

diff --git a/chipsec/helper/linux/linuxhelper.py b/chipsec/helper/linux/linuxhelper.py

index 2fd65140..f3f26bcb 100644

--- a/chipsec/helper/linux/linuxhelper.py

+++ b/chipsec/helper/linux/linuxhelper.py

@@ -153,7 +153,7 @@ class LinuxHelper(Helper):

             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(), "drivers", "linux", "chipsec.ko")