From 5e3f63c96a0d383efd6b7f6b957285e24aa0bd5b Mon Sep 17 00:00:00 2001
From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date: Fri, 19 Jan 2018 18:21:55 -0500
Subject: [PATCH] kernel modules no longer live in $ISADIR

---
 src/modules/flavor/elf.py | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/modules/flavor/elf.py b/src/modules/flavor/elf.py
index 09c277ee..c9368247 100644
--- a/src/modules/flavor/elf.py
+++ b/src/modules/flavor/elf.py
@@ -190,8 +190,6 @@ def process_elf_dependencies(action, pkg_vars, dyn_tok_conv, run_paths,
         dyn_tok_conv["$ORIGIN"] = [os.path.join("/",
             os.path.dirname(installed_path))]
 
-        kernel64 = None
-
         # For kernel modules, default path resolution is /platform/<platform>,
         # /kernel, /usr/kernel.  But how do we know what <platform> would be for
         # a given module?  Does it do fallbacks to, say, sun4u?
@@ -211,15 +209,6 @@ def process_elf_dependencies(action, pkg_vars, dyn_tok_conv, run_paths,
                                 rp.append("/platform/{0}/kernel".format(p))
                 # Default kernel search path
                 rp.extend(["/kernel", "/usr/kernel"])
-                # What subdirectory should we look in for 64-bit kernel modules?
-                if ei["bits"] == 64:
-                        if ei["arch"] == "i386":
-                                kernel64 = "amd64"
-                        elif ei["arch"] == "sparc":
-                                kernel64 = "sparcv9"
-                        else:
-                                raise RuntimeError("Unknown arch:{0}".format(
-                                    ei["arch"]))
         else:
                 for p in default_run_paths:
                         if ei["bits"] == 64:
@@ -245,16 +234,7 @@ def process_elf_dependencies(action, pkg_vars, dyn_tok_conv, run_paths,
                 pn, fn = os.path.split(d)
                 pathlist = []
                 for p in rp:
-                        if kernel64:
-                                # Find 64-bit modules the way krtld does.
-                                # XXX We don't resolve dependencies found in
-                                # /platform, since we don't know where under
-                                # /platform to look.
-                                deppath = \
-                                    os.path.join(p, pn, kernel64, fn).lstrip(
-                                    os.path.sep)
-                        else:
-                                deppath = os.path.join(p, d).lstrip(os.path.sep)
+                        deppath = os.path.join(p, d).lstrip(os.path.sep)
                         # deppath includes filename; remove that.
                         head, tail = os.path.split(deppath)
                         if head:
-- 
2.11.4.GIT