From a44aec2b1b02df43f9e90f39a92a30b30de97e84 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 31 Dec 2020 00:06:31 +0100 Subject: [PATCH] lib/systems/platforms: treat missing cpu version as generic pcBase Since 40e7be1 all ARM platforms that didn't have a parsed cpu version (e.g. arm-none-eabi) would be handled as armv7l-hf-multiplatform which did break building arm-trusted-platform packages for some targets (e.g. rk3399). Using pcBase as fallback, instead of armv7l-hf-multiplatform, corresponds with the behaviour we had before 40e7be1. --- lib/systems/platforms.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index a0dccc859883..fdd127e5541f 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -490,8 +490,9 @@ rec { # ARM else if platform.isAarch32 then let - version = platform.parsed.cpu.version or ""; - in if lib.versionOlder version "6" then sheevaplug + version = platform.parsed.cpu.version or null; + in if version == null then pcBase + else if lib.versionOlder version "6" then sheevaplug else if lib.versionOlder version "7" then raspberrypi else armv7l-hf-multiplatform else if platform.isAarch64 then aarch64-multiplatform