kexectools: Disable only on RISC-V if Linux.
The isKexecable flag treated Linux without kexec as just a normal variant, when it really should be treated as a special case incurring complexity debt to support.
This commit is contained in:
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://horms.net/projects/kexec/kexec-tools;
|
||||
description = "Tools related to the kexec Linux feature";
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = platforms.riscv;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -41,7 +41,8 @@ in stdenv.mkDerivation rec {
|
||||
buildInputs =
|
||||
[ linuxHeaders libcap kmod xz pam acl
|
||||
/* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
|
||||
libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
|
||||
libmicrohttpd ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++
|
||||
[ libseccomp libffi audit lz4 bzip2 libapparmor
|
||||
iptables gnu-efi
|
||||
# This is actually native, but we already pull it from buildPackages
|
||||
pythonLxmlEnv
|
||||
|
||||
@@ -3131,9 +3131,7 @@ with pkgs;
|
||||
|
||||
keepalived = callPackage ../tools/networking/keepalived { };
|
||||
|
||||
kexectools = if hostPlatform.isKexecable
|
||||
then callPackage ../os-specific/linux/kexectools { }
|
||||
else null;
|
||||
kexectools = callPackage ../os-specific/linux/kexectools { };
|
||||
|
||||
keybase = callPackage ../tools/security/keybase { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user