[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, targets/support/

[Matt Turner]

commit:     ad04eab48c96350f0866d6c1fe76f289499df21b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 01:10:58 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 01:13:52 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ad04eab4

catalyst: Remove boot/kernel/*/kernelopts support

This undocumented option was only wired up for hppa, and was used by the
minimal livecd to set panic=30.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py          | 11 -----------
 targets/support/bootloader-setup.sh |  8 +-------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 10cffd4c..4a1b4eb6 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -662,7 +662,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
                     "boot/kernel/" + x + "/gk_action",
                     "boot/kernel/" + x + "/gk_kernargs",
                     "boot/kernel/" + x + "/initramfs_overlay",
-                    "boot/kernel/" + x + "/kernelopts",
                     "boot/kernel/" + x + "/packages",
                     "boot/kernel/" + x + "/softlevel",
                     "boot/kernel/" + x + "/sources",
@@ -1508,16 +1507,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
             return
         self._copy_kernel_config(kname=kname)
 
-        # If we need to pass special options to the bootloader
-        # for this kernel put them into the environment
-        key = 'boot/kernel/' + kname + '/kernelopts'
-        if key in self.settings:
-            myopts = self.settings[key]
-
-            if not isinstance(myopts, str):
-                myopts = ' '.join(myopts)
-            self.env[kname + "_kernelopts"] = myopts
-
         key = 'boot/kernel/' + kname + '/extraversion'
         self.settings.setdefault(key, '')
         self.env["clst_kextraversion"] = self.settings[key]

diff --git a/targets/support/bootloader-setup.sh 
b/targets/support/bootloader-setup.sh
index a998a420..08d25b59 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -70,16 +70,10 @@ case ${clst_hostarch} in
                boot_kernel_common_name=${first/%32/}
                boot_kernel_common_name=${boot_kernel_common_name/%64/}
 
-               for x in ${clst_boot_kernel}
-               do
-                       eval kopt=\$clst_boot_kernel_${x}_kernelopts
-                       kopts+=(${kopt})
-               done
-
                # copy the bootloader for the final image
                cp /usr/share/palo/iplboot $1/boot/
 
-               echo "--commandline=0/${boot_kernel_common_name} 
initrd=${first}.igz ${default_append_line[@]} ${kopts[@]}" >> ${icfg}
+               echo "--commandline=0/${boot_kernel_common_name} 
initrd=${first}.igz ${default_append_line[@]}" >> ${icfg}
                echo "--bootloader=boot/iplboot" >> ${icfg}
                echo "--ramdisk=boot/${first}.igz" >> ${icfg}
                for x in ${clst_boot_kernel}