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 2675D139337 for ; Thu, 29 Jul 2021 01:24:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91F10E0923; Thu, 29 Jul 2021 01:24:44 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 81098E0922 for ; Thu, 29 Jul 2021 01:24:44 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id e2-20020a17090a4a02b029016f3020d867so6803595pjh.3 for ; Wed, 28 Jul 2021 18:24:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kmm0LHrGZmGxr15eK0XmcO2DtOG1b6cXUB5sEFxStHY=; b=PXBDz+EbmVM9S1na0RYKMqCCEXBYOyD85w8S5mskr1tzLDKNMnJ1oYwpm4Ues7gPuO fYdkd3knlCtCjbBkQ3S8HRT3TdKpscsSYW0pmiA6uKOtlkWIdE0i27OkkpNc2Q1I5pkg s3/ayNqqjhWg60u/hBiV51bC0eCa3f4i72bWZztNu1/hPa1sJmIVBS9fmPMd4tVf7+qB SYEABaGKUg7QCvZgXlhPs5bTJVNf9DAIiLRImmtWAIP7ug9UKfhC6gZn1JKYaXzQAi+m 0woQuLy+IzUr9xRtAMqD4V8ZtJdHY5WxLHVVG3yS96qGT9U6K8lX8uW7eN4J9bOlPtvI k41A== X-Gm-Message-State: AOAM533nxfhDss12nB+BQG6MDzWnURN+cZjtlUfiU1c6f2AIMpOByGDA PKurhRQnNyMtRjskdibIbHw+lWczCZHnZg== X-Google-Smtp-Source: ABdhPJziSzHR3yjRgAOT8nHsIR9VsCtSy9US1bKTs345ZGw9/G6ZCgSatiK2GvWYAtoVgqwTxyI0vQ== X-Received: by 2002:a62:30c5:0:b029:31e:fa6d:1738 with SMTP id w188-20020a6230c50000b029031efa6d1738mr2544453pfw.55.1627521883164; Wed, 28 Jul 2021 18:24:43 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id w10sm1283714pgl.46.2021.07.28.18.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 18:24:42 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 2/2] catalyst: Remove boot/kernel/*/kernelopts support Date: Wed, 28 Jul 2021 18:24:35 -0700 Message-Id: <20210729012435.560803-2-mattst88@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210729012435.560803-1-mattst88@gentoo.org> References: <20210729012435.560803-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: ab3b87fe-84d0-4e51-88ef-40b927713f6f X-Archives-Hash: 8f0cdaae39176cbe4f21429506a5d231 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 --- 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} -- 2.31.1