From 4d5bfd8c4890ba04e96aec29bb9d2a03b6d8846d Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 24 Sep 2022 03:05:33 -0700
Subject: [PATCH] eliminate CONFIG_LOCALVERSION; it adds complexity

---
 src/default.nix                 | 8 ++------
 src/platform/kevin/linux.config | 2 +-
 src/userspace/default.nix       | 6 +++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/default.nix b/src/default.nix
index f17130e..67e704d 100644
--- a/src/default.nix
+++ b/src/default.nix
@@ -18,12 +18,8 @@ let
         initramfs_image = self.initramfs;
       };
       kernel        = self.callPackage ./kernel { };
-      userspace = self.callPackage ./userspace {
-        kernelname = "${self.kernel.version}-${self.platform_name}";
-      };
-      initramfs     = self.callPackage ./initramfs {
-        inherit (self) userspace;
-      };
+      userspace = self.callPackage ./userspace { };
+      initramfs     = self.callPackage ./initramfs { };
     }))
   .overrideScope' overlay;
 in {
diff --git a/src/platform/kevin/linux.config b/src/platform/kevin/linux.config
index 143b317..e6b0399 100644
--- a/src/platform/kevin/linux.config
+++ b/src/platform/kevin/linux.config
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_COMPILE_TEST=y
-CONFIG_LOCALVERSION="-kevin"
+CONFIG_LOCALVERSION=""
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_INIT=""
 CONFIG_DEFAULT_HOSTNAME="localhost"
diff --git a/src/userspace/default.nix b/src/userspace/default.nix
index 52d4907..dc97f8d 100644
--- a/src/userspace/default.nix
+++ b/src/userspace/default.nix
@@ -2,7 +2,7 @@
 # `lvm`, `dmsetup`, `cryptsetup`, and `kexec`.
 { lib
 , nixpkgsOnBuildForHost
-, platform_name
+, kernel
 , modules_noinsmod ? [ ]
 , modules_insmod   ? [ ]
 , kernelname
@@ -13,8 +13,8 @@ let
 
 in stdenv.mkDerivation {
   name = "ownerboot-initramfs-userspace";
-  modules        = (lib.concatMapStringsSep "\n" (m: "${kernelname}/kernel/" + m) (modules_insmod ++ modules_noinsmod))+"\n";
-  modules_insmod = (lib.concatMapStringsSep "\n" (m: "${kernelname}/kernel/" + m) modules_insmod) + "\n";
+  modules_all    = (lib.concatMapStringsSep "\n" (m: "${kernel.version}/kernel/" + m) (modules_insmod ++ modules_noinsmod))+"\n";
+  modules_insmod = (lib.concatMapStringsSep "\n" (m: "${kernel.version}/kernel/" + m) modules_insmod) + "\n";
   bootScript = builtins.readFile ../boot.sh;
   passAsFile = [ "bootScript" "modules_insmod" ];
   dontUnpack = true;