From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29BF4139000 for ; Thu, 29 Jul 2021 22:00:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FA10E0990; Thu, 29 Jul 2021 22:00:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E029E0990 for ; Thu, 29 Jul 2021 22:00:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5CFF343083 for ; Thu, 29 Jul 2021 22:00:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D3FF7BD for ; Thu, 29 Jul 2021 22:00:28 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1627521232.ad04eab48c96350f0866d6c1fe76f289499df21b.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/bootloader-setup.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: ad04eab48c96350f0866d6c1fe76f289499df21b X-VCS-Branch: master Date: Thu, 29 Jul 2021 22:00:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 930e3ee8-1db3-477c-9834-3c1cb8503d77 X-Archives-Hash: 03db4a4d7847909e0b155a138a821fbb commit: ad04eab48c96350f0866d6c1fe76f289499df21b Author: Matt Turner gentoo org> AuthorDate: Thu Jul 29 01:10:58 2021 +0000 Commit: Matt Turner gentoo 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 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} From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F943158087 for ; Sun, 30 Jan 2022 20:43:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54B652BC01A; Sun, 30 Jan 2022 20:43:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 383A92BC01A for ; Sun, 30 Jan 2022 20:43:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED239342F47 for ; Sun, 30 Jan 2022 20:42:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57BA32C3 for ; Sun, 30 Jan 2022 20:42:57 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1627521232.ad04eab48c96350f0866d6c1fe76f289499df21b.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/bootloader-setup.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: ad04eab48c96350f0866d6c1fe76f289499df21b X-VCS-Branch: wip/mattst88 Date: Sun, 30 Jan 2022 20:42:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 646e4185-f964-460a-9ec5-8fab28bf97b0 X-Archives-Hash: 2c6c7da6d259cf655dd4b645b17ad0a4 Message-ID: <20220130204257.XPduOkVnTb8OxU6yu3-_7Kl1cQeKEVfeiVH2LgPNSxA@z> commit: ad04eab48c96350f0866d6c1fe76f289499df21b Author: Matt Turner gentoo org> AuthorDate: Thu Jul 29 01:10:58 2021 +0000 Commit: Matt Turner gentoo 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 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}