public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uboot: 2019.10 -> 2020.01

Browse Source 
In addition, removes the python2 dependency. Anyway, it was required for
the updated revision to build.
This commit is contained in:
Samuel Dionne-Riel 2020-01-21 16:34:09 -05:00
parent 4311cfa157
commit ca931caf16
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/misc/uboot/default.nix
View File

@ -6,10 +6,10 @@
}: }:
let let
defaultVersion = "2019.10"; defaultVersion = "2020.01";
defaultSrc = fetchurl { defaultSrc = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida";
}; };
buildUBoot = { buildUBoot = {
version ? null version ? null
@ -28,19 +28,7 @@ let
src = if src == null then defaultSrc else src; src = if src == null then defaultSrc else src;
patches = [ patches = extraPatches;
# Submitted upstream: https://patchwork.ozlabs.org/patch/1203693/
(fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
})
# Submitted upstream: https://patchwork.ozlabs.org/patch/1203678/
(fetchpatch {
name = "rockchip-allow-loading-larger-kernels.patch";
url = "https://marc.info/?l=u-boot&m=157537843004298&q=raw";
sha256 = "0l3l88cc9xkxkraql82pfgpx6nqn4dj7cvfaagh5pzfwkxyw0n3p";
})
] ++ extraPatches;
postPatch = '' postPatch = ''
patchShebangs tools patchShebangs tools
@ -53,7 +41,7 @@ let
dtc dtc
flex flex
openssl openssl
(buildPackages.python2.withPackages (p: [ p.libfdt ])) (buildPackages.python3.withPackages (p: [ p.libfdt ]))
swig swig
]; ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];