mirror of
https://github.com/NixOS/nixos-hardware.git
synced 2025-11-08 19:46:10 +01:00
fix the unused module error accross all imx8
this fixes the unused modules error that wad introduced by https://github.com/NixOS/nixpkgs/pull/366004 Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
This commit is contained in:
parent
5f052b2663
commit
6209032a7c
3 changed files with 100 additions and 89 deletions
|
|
@ -1,56 +1,57 @@
|
||||||
{ pkgs, ... } @ args:
|
{ pkgs, ... }@args:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (
|
||||||
version = "5.15.71";
|
args
|
||||||
|
// rec {
|
||||||
|
version = "5.15.71";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = version;
|
modDirVersion = version;
|
||||||
|
|
||||||
defconfig = "imx_v8_defconfig";
|
defconfig = "imx_v8_defconfig";
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/pull/366004
|
# https://github.com/NixOS/nixpkgs/pull/366004
|
||||||
# introduced a breaking change that if a module is declared but it is not being used it will fail
|
# introduced a breaking change that if a module is declared but it is not being used it will fail.
|
||||||
# if you try to suppress each of he errors e.g.
|
ignoreConfigErrors = true;
|
||||||
# REISERFS_FS_SECURITY = lib.mkForce unset; within structuredExtraConfig
|
|
||||||
# that list runs to a long 100+ modules so we go back to the previous default and ignore them
|
|
||||||
ignoreConfigErrors = true;
|
|
||||||
|
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
];
|
];
|
||||||
|
|
||||||
autoModules = false;
|
autoModules = false;
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
CRYPTO_TLS m
|
CRYPTO_TLS m
|
||||||
TLS y
|
TLS y
|
||||||
MD_RAID0 m
|
MD_RAID0 m
|
||||||
MD_RAID1 m
|
MD_RAID1 m
|
||||||
MD_RAID10 m
|
MD_RAID10 m
|
||||||
MD_RAID456 m
|
MD_RAID456 m
|
||||||
DM_VERITY m
|
DM_VERITY m
|
||||||
LOGO y
|
LOGO y
|
||||||
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER n
|
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER n
|
||||||
FB_EFI n
|
FB_EFI n
|
||||||
EFI_STUB y
|
EFI_STUB y
|
||||||
EFI y
|
EFI y
|
||||||
VIRTIO y
|
VIRTIO y
|
||||||
VIRTIO_PCI y
|
VIRTIO_PCI y
|
||||||
VIRTIO_BLK y
|
VIRTIO_BLK y
|
||||||
DRM_VIRTIO_GPU y
|
DRM_VIRTIO_GPU y
|
||||||
EXT4_FS y
|
EXT4_FS y
|
||||||
USBIP_CORE m
|
USBIP_CORE m
|
||||||
USBIP_VHCI_HCD m
|
USBIP_VHCI_HCD m
|
||||||
USBIP_HOST m
|
USBIP_HOST m
|
||||||
USBIP_VUDC m
|
USBIP_VUDC m
|
||||||
'';
|
'';
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nxp-imx";
|
owner = "nxp-imx";
|
||||||
repo = "linux-imx";
|
repo = "linux-imx";
|
||||||
# tag: refs/tags/lf-5.15.71-2.2.0
|
# tag: refs/tags/lf-5.15.71-2.2.0
|
||||||
rev = "3313732e9984cb8a6b10a9085c7e18d58e770d56";
|
rev = "3313732e9984cb8a6b10a9085c7e18d58e770d56";
|
||||||
sha256 = "sha256-PBRiSgjPOq4keiwPOfNOswf1Zzdbn6YOjpOgv4/Oscc=";
|
sha256 = "sha256-PBRiSgjPOq4keiwPOfNOswf1Zzdbn6YOjpOgv4/Oscc=";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or { }))
|
}
|
||||||
|
// (args.argsOverride or { })
|
||||||
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,50 +1,56 @@
|
||||||
{pkgs, ...} @ args:
|
{ pkgs, ... }@args:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
buildLinux (args
|
buildLinux (
|
||||||
// rec {
|
args
|
||||||
version = "6.1.55";
|
// rec {
|
||||||
name = "imx8mp-linux";
|
version = "6.1.55";
|
||||||
|
name = "imx8mp-linux";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = version;
|
modDirVersion = version;
|
||||||
|
|
||||||
defconfig = "imx_v8_defconfig";
|
defconfig = "imx_v8_defconfig";
|
||||||
|
|
||||||
kernelPatches = [
|
# https://github.com/NixOS/nixpkgs/pull/366004
|
||||||
];
|
# introduced a breaking change that if a module is declared but it is not being used it will faill.
|
||||||
|
ignoreConfigErrors = true;
|
||||||
|
|
||||||
autoModules = false;
|
kernelPatches = [
|
||||||
|
];
|
||||||
|
|
||||||
extraConfig = ''
|
autoModules = false;
|
||||||
CRYPTO_TLS m
|
|
||||||
TLS y
|
|
||||||
MD_RAID0 m
|
|
||||||
MD_RAID1 m
|
|
||||||
MD_RAID10 m
|
|
||||||
MD_RAID456 m
|
|
||||||
DM_VERITY m
|
|
||||||
LOGO y
|
|
||||||
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER n
|
|
||||||
FB_EFI n
|
|
||||||
EFI_STUB y
|
|
||||||
EFI y
|
|
||||||
VIRTIO y
|
|
||||||
VIRTIO_PCI y
|
|
||||||
VIRTIO_BLK y
|
|
||||||
DRM_VIRTIO_GPU y
|
|
||||||
EXT4_FS y
|
|
||||||
USBIP_CORE m
|
|
||||||
USBIP_VHCI_HCD m
|
|
||||||
USBIP_HOST m
|
|
||||||
USBIP_VUDC m
|
|
||||||
'';
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
extraConfig = ''
|
||||||
owner = "nxp-imx";
|
CRYPTO_TLS m
|
||||||
repo = "linux-imx";
|
TLS y
|
||||||
# tag: lf-6.1.55-2.2.0
|
MD_RAID0 m
|
||||||
rev = "770c5fe2c1d1529fae21b7043911cd50c6cf087e";
|
MD_RAID1 m
|
||||||
sha256 = "sha256-tIWt75RUrjB6KmUuAYBVyAC1dmVGSUAgqV5ROJh3xU0=";
|
MD_RAID10 m
|
||||||
};
|
MD_RAID456 m
|
||||||
}
|
DM_VERITY m
|
||||||
// (args.argsOverride or {}))
|
LOGO y
|
||||||
|
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER n
|
||||||
|
FB_EFI n
|
||||||
|
EFI_STUB y
|
||||||
|
EFI y
|
||||||
|
VIRTIO y
|
||||||
|
VIRTIO_PCI y
|
||||||
|
VIRTIO_BLK y
|
||||||
|
DRM_VIRTIO_GPU y
|
||||||
|
EXT4_FS y
|
||||||
|
USBIP_CORE m
|
||||||
|
USBIP_VHCI_HCD m
|
||||||
|
USBIP_HOST m
|
||||||
|
USBIP_VUDC m
|
||||||
|
'';
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "nxp-imx";
|
||||||
|
repo = "linux-imx";
|
||||||
|
# tag: lf-6.1.55-2.2.0
|
||||||
|
rev = "770c5fe2c1d1529fae21b7043911cd50c6cf087e";
|
||||||
|
sha256 = "sha256-tIWt75RUrjB6KmUuAYBVyAC1dmVGSUAgqV5ROJh3xU0=";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
// (args.argsOverride or { })
|
||||||
|
)
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,10 @@ with pkgs;
|
||||||
|
|
||||||
defconfig = "imx_v8_defconfig";
|
defconfig = "imx_v8_defconfig";
|
||||||
|
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/366004
|
||||||
|
# introduced a breaking change that if a module is declared but it is not being used it will faill.
|
||||||
|
ignoreConfigErrors = true;
|
||||||
|
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue