ubootRock64, ubootRockPro64: use dtc 1.4.5
This commit is contained in:
parent
404773e336
commit
414c42a697
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchgit, fetchpatch, flex, bison, pkgconfig, python2, swig, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dtc-${version}";
|
||||
pname = "dtc";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchgit {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig
|
||||
{ stdenv, lib, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, swig
|
||||
, armTrustedFirmwareAllwinner
|
||||
, buildPackages
|
||||
}:
|
||||
|
|
|
@ -15302,9 +15302,35 @@ in
|
|||
# Non-upstream U-Boots:
|
||||
ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
|
||||
|
||||
ubootRock64 = callPackage ../misc/uboot/rock64.nix { };
|
||||
inherit (let
|
||||
dtc = buildPackages.dtc.overrideAttrs (old: rec {
|
||||
version = "1.4.5";
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3";
|
||||
};
|
||||
});
|
||||
# Newer dtc versions are incompatible with U-Boot 2017.09
|
||||
inherit (callPackage ../misc/uboot {
|
||||
inherit dtc;
|
||||
buildPackages = buildPackages // {
|
||||
python2 = buildPackages.python2.override (old: {
|
||||
packageOverrides = pySelf: pySuper: {
|
||||
libfdt = pySelf.toPythonModule dtc;
|
||||
};
|
||||
});
|
||||
};
|
||||
}) buildUBoot;
|
||||
in {
|
||||
ubootRock64 = callPackage ../misc/uboot/rock64.nix {
|
||||
inherit buildUBoot;
|
||||
};
|
||||
|
||||
ubootRockPro64 = callPackage ../misc/uboot/rockpro64.nix { };
|
||||
ubootRockPro64 = callPackage ../misc/uboot/rockpro64.nix {
|
||||
inherit buildUBoot;
|
||||
};
|
||||
}) ubootRock64 ubootRockPro64;
|
||||
|
||||
uclibc = callPackage ../os-specific/linux/uclibc { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue