eliminate CONFIG_LOCALVERSION; it adds complexity

master
Adam Joseph 2 years ago
parent c15d149350
commit 4d5bfd8c48

@ -18,12 +18,8 @@ let
initramfs_image = self.initramfs; initramfs_image = self.initramfs;
}; };
kernel = self.callPackage ./kernel { }; kernel = self.callPackage ./kernel { };
userspace = self.callPackage ./userspace { userspace = self.callPackage ./userspace { };
kernelname = "${self.kernel.version}-${self.platform_name}"; initramfs = self.callPackage ./initramfs { };
};
initramfs = self.callPackage ./initramfs {
inherit (self) userspace;
};
})) }))
.overrideScope' overlay; .overrideScope' overlay;
in { in {

@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
# #
CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_COMPILE_TEST=y CONFIG_COMPILE_TEST=y
CONFIG_LOCALVERSION="-kevin" CONFIG_LOCALVERSION=""
CONFIG_BUILD_SALT="" CONFIG_BUILD_SALT=""
CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_INIT=""
CONFIG_DEFAULT_HOSTNAME="localhost" CONFIG_DEFAULT_HOSTNAME="localhost"

@ -2,7 +2,7 @@
# `lvm`, `dmsetup`, `cryptsetup`, and `kexec`. # `lvm`, `dmsetup`, `cryptsetup`, and `kexec`.
{ lib { lib
, nixpkgsOnBuildForHost , nixpkgsOnBuildForHost
, platform_name , kernel
, modules_noinsmod ? [ ] , modules_noinsmod ? [ ]
, modules_insmod ? [ ] , modules_insmod ? [ ]
, kernelname , kernelname
@ -13,8 +13,8 @@ let
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "ownerboot-initramfs-userspace"; name = "ownerboot-initramfs-userspace";
modules = (lib.concatMapStringsSep "\n" (m: "${kernelname}/kernel/" + m) (modules_insmod ++ modules_noinsmod))+"\n"; modules_all = (lib.concatMapStringsSep "\n" (m: "${kernel.version}/kernel/" + m) (modules_insmod ++ modules_noinsmod))+"\n";
modules_insmod = (lib.concatMapStringsSep "\n" (m: "${kernelname}/kernel/" + m) modules_insmod) + "\n"; modules_insmod = (lib.concatMapStringsSep "\n" (m: "${kernel.version}/kernel/" + m) modules_insmod) + "\n";
bootScript = builtins.readFile ../boot.sh; bootScript = builtins.readFile ../boot.sh;
passAsFile = [ "bootScript" "modules_insmod" ]; passAsFile = [ "bootScript" "modules_insmod" ];
dontUnpack = true; dontUnpack = true;

Loading…
Cancel
Save