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 146A4138359 for ; Wed, 21 Oct 2020 00:24:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67662E0A81; Wed, 21 Oct 2020 00:24:08 +0000 (UTC) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.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 6177AE0A81 for ; Wed, 21 Oct 2020 00:24:08 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id 1so295837ple.2 for ; Tue, 20 Oct 2020 17:24:08 -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=D23RkWI2GCACM4nDQ6Nr8AglDFasZpv4BH3zDtkz9wk=; b=YIvXZGWIrI2bElk/LnFpeFX2L2Uc1p5L1PQenf+NTiSnQhkL7oLzjKtmCOr1uliyEB iAIb3PoXSGqqjQMShMcIddQw3l+8xVM08BBJWYkpezQD0N/UwoN5DTly1G07wJtpQ75q o+RgIQIfwaV1XerytF/vRuZ896DGElBYcoHzKWFuzhKSHAdMUzPPJKQBvMsddXiOdJbR MDuBR+4jsQhlE/UTemVDBuVMbmy7EktcTjW6lwVvqFXGHfECE82KBfLmKVxdHboZgciH sbhQjlXF2WfWCOjOAe/umU8EvMLPAhxmIzc2Ihtbx5qmcLQ46xwlD0iSSU33Cb0tvORs zDwQ== X-Gm-Message-State: AOAM533y1aZoFSzmWSpX62r0BOi1IrAcOQ9HIupO1N9o9JFxKwD9QwPa OC1n2sEYu9PCRA4gDPqtVKRu817eeQb5fw== X-Google-Smtp-Source: ABdhPJxhan2ULwf5NZEMUVqcBfA2RjPa82G1txX3jMO3KOTRCjWVUYQuN1RAHmqU86ifcRkwG7V+VQ== X-Received: by 2002:a17:90a:8c:: with SMTP id a12mr605520pja.155.1603239847084; Tue, 20 Oct 2020 17:24:07 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id q16sm156478pfu.206.2020.10.20.17.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:06 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 06/37] targets: Fix filtered_kname Date: Tue, 20 Oct 2020 17:23:13 -0700 Message-Id: <20201021002344.378131-6-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: cc16b431-cac4-4dbf-ae3b-f48737d76413 X-Archives-Hash: 908592fd7624cadbfedc4de12b36ab59 A follow-on commit is going to remove this code, but I thought it was still valuable to fix the immediate problem for documentation purporses. Broken since it was first added in 2006. Fixes: 6aa64bf7 ("filter kname so - and . work") Signed-off-by: Matt Turner --- targets/support/kmerge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 702c5454..d150a530 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -126,7 +126,7 @@ rm /etc/localtime cp -f /usr/share/zoneinfo/UTC /etc/localtime filtered_kname=${clst_kname/-/_} -filtered_kname=${clst_kname/\//_} +filtered_kname=${filtered_kname/\//_} filtered_kname=${filtered_kname/\./_} eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use" -- 2.26.2