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 84B5D138359 for ; Wed, 21 Oct 2020 00:24:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7A11E0A46; Wed, 21 Oct 2020 00:24:09 +0000 (UTC) Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) (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 CF75EE0A46 for ; Wed, 21 Oct 2020 00:24:09 +0000 (UTC) Received: by mail-pj1-f66.google.com with SMTP id p3so1398412pjd.0 for ; Tue, 20 Oct 2020 17:24:09 -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=j6wJkWKVFnbyqlqRlPLFzskKoFCRTmTcqJM9m19lH9c=; b=Fj3RmRwFgOBFpQcOu4J3MDrUfs/JermlzJm8bQ02A7Mi1j4o3DZoF1bV54h1mo9dpW xKSxJzue7pfCL4oqUTDOFgCjBwlxf1ZpfjDa97G3X/JEJPz/GXgduhKaK/W8QZ8bM/VM hRE9Iv0YZ3+ttZZYLm87aBuIjykhBtJdcr5PpXhpN4ZRzlxlpjZAbQk3JIhE4yAlQyxT kdykiaobIKOCdNl+vvPLjkFMeW/GuqBXyq87+cFy/9oJrT/vCtayRhAz3Jlmz09wgTgD ZXA+m6AUZnPc/47gMOPJPoWu9K0dNnR2VlxWDjWMOySl7Vg3S3JfW/+pGGhK6MkI7qrs kELg== X-Gm-Message-State: AOAM5328eTlReFK758LwZ0c4nsPvTXGl4sbqZQcEvMk8TUT6RyKJq2ON /rKGrPu/0IY1MjFPoQM3BJ2FSaRsMfx7Jw== X-Google-Smtp-Source: ABdhPJyJiNxwv35HCUtWiIlpcPANv0KPsG7f0WJvm8ipyf+Hq3TXXFVlD1PRbYcputIF9hfDdmEa+A== X-Received: by 2002:a17:90a:e884:: with SMTP id h4mr648169pjy.126.1603239848643; Tue, 20 Oct 2020 17:24:08 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id bf12sm248683pjb.17.2020.10.20.17.24.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:07 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 07/37] targets: Consolidate evals using filtered_kname Date: Tue, 20 Oct 2020 17:23:14 -0700 Message-Id: <20201021002344.378131-7-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: 69561060-7375-4a88-9cfa-2e6f2925e068 X-Archives-Hash: 2872cbe6c51c2c0260277560796ede6f Signed-off-by: Matt Turner --- targets/support/kmerge.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index d150a530..b0583785 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -65,9 +65,6 @@ setup_gk_args() { } genkernel_compile(){ - eval "clst_initramfs_overlay=\$clst_boot_kernel_${filtered_kname}_initramfs_overlay" - eval "clst_kernel_merge=\$clst_boot_kernel_${filtered_kname}_packages" - setup_gk_args #echo "The GK_ARGS are" #echo ${GK_ARGS[@]} @@ -129,6 +126,8 @@ 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" -- 2.26.2