lenn/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-07 02:18:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update correct hash for imx mkimage utility

Browse Source 
- Don't fetch dotGit directory.
- Dot git dir gets different object packs when it is pulled from
  different nixpkgs versions which causes hash mismatch.
- Patch Makefile not use git revision from .git.

Signed-off-by: Ganga Ram <Ganga.Ram@tii.ae>
This commit is contained in:
Ganga Ram
2025-05-21 16:51:52 +04:00
parent 6ac6ec6fcb
commit 4ce6bba2f7
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nxp/imx8mp-evk/bsp/imx8mp-boot.nix
View File

@@ -15,18 +15,21 @@ with pkgs; let
imx8mp-firmware = pkgs.callPackage ./imx8mp-firmware.nix {}; imx8mp-firmware = pkgs.callPackage ./imx8mp-firmware.nix {};
imx8mp-uboot = pkgs.callPackage ./imx8mp-uboot.nix {}; imx8mp-uboot = pkgs.callPackage ./imx8mp-uboot.nix {};
imx8mp-optee-os = pkgs.callPackage ./imx8mp-optee-os.nix {}; imx8mp-optee-os = pkgs.callPackage ./imx8mp-optee-os.nix {};
src = pkgs.fetchgit {
url = "https://github.com/nxp-imx/imx-mkimage.git";
rev = "c4365450fb115d87f245df2864fee1604d97c06a";
sha256 = "sha256-KVIVHwBpAwd1RKy3RrYxGIniE45CDlN5RQTXsMg1Jwk=";
};
shortRev = builtins.substring 0 8 src.rev;
in { in {
imx8m-boot = pkgs.stdenv.mkDerivation rec { imx8m-boot = pkgs.stdenv.mkDerivation rec {
inherit src;
name = "imx8mp-mkimage"; name = "imx8mp-mkimage";
version = "lf-6.1.55-2.2.0"; version = "lf-6.1.55-2.2.0";
src = pkgs.fetchgit {
url = "https://github.com/nxp-imx/imx-mkimage.git";
rev = "c4365450fb115d87f245df2864fee1604d97c06a";
sha256 = "sha256-xycEaWKVM63BlDyBKNN0OefyK6iX/fQOTvv4fRVM55U=";
leaveDotGit = true;
};
postPatch = '' postPatch = ''
substituteInPlace Makefile \
--replace 'git rev-parse --short=8 HEAD' 'echo ${shortRev}'
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace 'CC = gcc' 'CC = clang' --replace 'CC = gcc' 'CC = clang'
patchShebangs scripts patchShebangs scripts

15
nxp/imx8mq-evk/bsp/imx8mq-boot.nix
View File

@@ -14,18 +14,21 @@ with pkgs; let
imx8mq-firmware = pkgs.callPackage ./imx8mq-firmware.nix {}; imx8mq-firmware = pkgs.callPackage ./imx8mq-firmware.nix {};
imx8mq-uboot = pkgs.callPackage ./imx8mq-uboot.nix {}; imx8mq-uboot = pkgs.callPackage ./imx8mq-uboot.nix {};
imx8mq-optee-os = pkgs.callPackage ./imx8mq-optee-os.nix {}; imx8mq-optee-os = pkgs.callPackage ./imx8mq-optee-os.nix {};
src = pkgs.fetchgit {
url = "https://github.com/nxp-imx/imx-mkimage.git";
rev = "c4365450fb115d87f245df2864fee1604d97c06a";
sha256 = "sha256-KVIVHwBpAwd1RKy3RrYxGIniE45CDlN5RQTXsMg1Jwk=";
};
shortRev = builtins.substring 0 8 src.rev;
in { in {
imx8m-boot = pkgs.stdenv.mkDerivation rec { imx8m-boot = pkgs.stdenv.mkDerivation rec {
inherit src;
name = "imx8mq-mkimage"; name = "imx8mq-mkimage";
version = "lf-6.1.55-2.2.0"; version = "lf-6.1.55-2.2.0";
src = pkgs.fetchgit {
url = "https://github.com/nxp-imx/imx-mkimage.git";
rev = "c4365450fb115d87f245df2864fee1604d97c06a";
sha256 = "sha256-xycEaWKVM63BlDyBKNN0OefyK6iX/fQOTvv4fRVM55U=";
leaveDotGit = true;
};
postPatch = '' postPatch = ''
substituteInPlace Makefile \
--replace 'git rev-parse --short=8 HEAD' 'echo ${shortRev}'
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace 'CC = gcc' 'CC = clang' --replace 'CC = gcc' 'CC = clang'
patchShebangs scripts patchShebangs scripts