bcachefs: fix version not showing correctly
buildLinux doesn't provide argsOverride by default. Prior to663caaa, a default kernel was replaced with a direct invocation to buildLinux, this broke the use of argsOverride, in663caaa, the use of argsOverride was removed, and then later the invocation of buildLinux was replaced with vanilla linux kernel that required argsOverride which then rebroke things again. Recommend either: put argsOverride inside buildLinux, or replace it with something less confusing to maintainers.
This commit is contained in:
committed by
Jörg Thalheim
parent
d6bf8b47ec
commit
1048867fe0
@@ -10,18 +10,25 @@
|
||||
, argsOverride ? {}
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
let localversion = "-bcachefs-unstable-${version.date}";
|
||||
in
|
||||
# NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
|
||||
(kernel.override ( args // {
|
||||
version = "${kernel.version}-bcachefs-unstable-${version.date}";
|
||||
|
||||
extraMeta = {
|
||||
branch = "master";
|
||||
broken = stdenv.isAarch64;
|
||||
maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ];
|
||||
};
|
||||
argsOverride = {
|
||||
version = "${kernel.version}${localversion}";
|
||||
modDirVersion = "${kernel.version}${localversion}";
|
||||
|
||||
extraMeta = {
|
||||
homepage = "https://bcachefs.org/";
|
||||
branch = "master";
|
||||
maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ];
|
||||
};
|
||||
} // argsOverride;
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
# we need this for uname
|
||||
LOCALVERSION = freeform localversion;
|
||||
BCACHEFS_FS = module;
|
||||
BCACHEFS_QUOTA = option yes;
|
||||
BCACHEFS_POSIX_ACL = option yes;
|
||||
|
||||
Reference in New Issue
Block a user