Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 06/37] targets: Fix filtered_kname
Date: Wed, 21 Oct 2020 00:24:09
Message-Id: 20201021002344.378131-6-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/37] catalyst: Use early return to unindent code by Matt Turner
1 A follow-on commit is going to remove this code, but I thought it was
2 still valuable to fix the immediate problem for documentation purporses.
3 Broken since it was first added in 2006.
4
5 Fixes: 6aa64bf7 ("filter kname so - and . work")
6 Signed-off-by: Matt Turner <mattst88@g.o>
7 ---
8 targets/support/kmerge.sh | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11 diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
12 index 702c5454..d150a530 100755
13 --- a/targets/support/kmerge.sh
14 +++ b/targets/support/kmerge.sh
15 @@ -126,7 +126,7 @@ rm /etc/localtime
16 cp -f /usr/share/zoneinfo/UTC /etc/localtime
17
18 filtered_kname=${clst_kname/-/_}
19 -filtered_kname=${clst_kname/\//_}
20 +filtered_kname=${filtered_kname/\//_}
21 filtered_kname=${filtered_kname/\./_}
22
23 eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use"
24 --
25 2.26.2