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 07/37] targets: Consolidate evals using filtered_kname
Date: Wed, 21 Oct 2020 00:24:10
Message-Id: 20201021002344.378131-7-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/37] catalyst: Use early return to unindent code by Matt Turner
1 Signed-off-by: Matt Turner <mattst88@g.o>
2 ---
3 targets/support/kmerge.sh | 5 ++---
4 1 file changed, 2 insertions(+), 3 deletions(-)
5
6 diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
7 index d150a530..b0583785 100755
8 --- a/targets/support/kmerge.sh
9 +++ b/targets/support/kmerge.sh
10 @@ -65,9 +65,6 @@ setup_gk_args() {
11 }
12
13 genkernel_compile(){
14 - eval "clst_initramfs_overlay=\$clst_boot_kernel_${filtered_kname}_initramfs_overlay"
15 - eval "clst_kernel_merge=\$clst_boot_kernel_${filtered_kname}_packages"
16 -
17 setup_gk_args
18 #echo "The GK_ARGS are"
19 #echo ${GK_ARGS[@]}
20 @@ -129,6 +126,8 @@ filtered_kname=${clst_kname/-/_}
21 filtered_kname=${filtered_kname/\//_}
22 filtered_kname=${filtered_kname/\./_}
23
24 +eval "clst_initramfs_overlay=\$clst_boot_kernel_${filtered_kname}_initramfs_overlay"
25 +eval "clst_kernel_merge=\$clst_boot_kernel_${filtered_kname}_packages"
26 eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use"
27 eval eval clst_kernel_gk_kernargs=( \$clst_boot_kernel_${filtered_kname}_gk_kernargs )
28 eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources"
29 --
30 2.26.2