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 5ABBC138359 for ; Wed, 21 Oct 2020 00:24:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA3C6E0A03; Wed, 21 Oct 2020 00:24:11 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) (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 A27ADE0A03 for ; Wed, 21 Oct 2020 00:24:11 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id t14so383735pgg.1 for ; Tue, 20 Oct 2020 17:24:11 -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=O0iqhiWg8cd6KYgX5W/x+R4kVoic/daZaxNtIyPMo/s=; b=SCTC8L0uQ4Bi460KzDB+djmV/dGCMfbt9hnYNQ8+l4EWWqEiY2FrxWcIM1NgPgn7t/ fBQ6OMOepreEjlO3jtzRd0+4Y8zKSXJBCRlxbbmbUbTRXwmtF/s2622BkWpRV4mzGEM2 ExLFXj40FOoStUqQGJcg44/SB0Z1Nv530Icl2KS/gps549LbsgJ9yNK7ifA0Mn7TFBf1 4MK8klKokOGUyU79YkNB5AOq++LyHh62DC/5sUtcjt7CLrcJ27/8ShukjAbebUqmTtnV lnuGCEgyvdOhGHVu0kBgIG/DuAaT4qVcQwmr2Yt0IQ/ZwHgI8Wbisx3FaZwSpXiEc5ea 8vwQ== X-Gm-Message-State: AOAM532vHb8/blBYjfI46e9uEamRWvItBZ9BqPWQGmhu/xUbIAObmYfo h+/avD4x/KcorHAneUzOAvyeSK/2pXGpEA== X-Google-Smtp-Source: ABdhPJxVVt96UZ+sTI+G+FM62Nd1R1kxwpkQrBM/hIORT4fjQ3fH2zJJW6CcY+fKEb4OZmUJUb4tmw== X-Received: by 2002:a63:4644:: with SMTP id v4mr719008pgk.351.1603239850390; Tue, 20 Oct 2020 17:24:10 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id q14sm273990pgl.38.2020.10.20.17.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:09 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 08/37] targets: Remove filtered_kname Date: Tue, 20 Oct 2020 17:23:15 -0700 Message-Id: <20201021002344.378131-8-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-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: 257e7699-55fc-4beb-9c30-325cb5964423 X-Archives-Hash: 78d791f0544200a938e8e434b0be3bd2 Now that the Python code passes the sanitize name, we don't need this. Signed-off-by: Matt Turner --- targets/support/kmerge.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index b0583785..b4c3963a 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -122,15 +122,11 @@ export CONFIG_PROTECT="-*" rm /etc/localtime cp -f /usr/share/zoneinfo/UTC /etc/localtime -filtered_kname=${clst_kname/-/_} -filtered_kname=${filtered_kname/\//_} -filtered_kname=${filtered_kname/\./_} - -eval "clst_initramfs_overlay=\$clst_boot_kernel_${filtered_kname}_initramfs_overlay" -eval "clst_kernel_merge=\$clst_boot_kernel_${filtered_kname}_packages" -eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use" -eval eval clst_kernel_gk_kernargs=( \$clst_boot_kernel_${filtered_kname}_gk_kernargs ) -eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources" +eval "clst_initramfs_overlay=\$clst_boot_kernel_${kname}_initramfs_overlay" +eval "clst_kernel_merge=\$clst_boot_kernel_${kname}_packages" +eval "clst_kernel_use=\$clst_boot_kernel_${kname}_use" +eval eval clst_kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs ) +eval "clst_ksource=\$clst_boot_kernel_${kname}_sources" if [ -z "${clst_ksource}" ] then -- 2.26.2