| 1 |
Now that the Python code passes the sanitize name, we don't need this. |
| 2 |
|
| 3 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 4 |
--- |
| 5 |
targets/support/kmerge.sh | 14 +++++--------- |
| 6 |
1 file changed, 5 insertions(+), 9 deletions(-) |
| 7 |
|
| 8 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 9 |
index b0583785..b4c3963a 100755 |
| 10 |
--- a/targets/support/kmerge.sh |
| 11 |
+++ b/targets/support/kmerge.sh |
| 12 |
@@ -122,15 +122,11 @@ export CONFIG_PROTECT="-*" |
| 13 |
rm /etc/localtime |
| 14 |
cp -f /usr/share/zoneinfo/UTC /etc/localtime |
| 15 |
|
| 16 |
-filtered_kname=${clst_kname/-/_} |
| 17 |
-filtered_kname=${filtered_kname/\//_} |
| 18 |
-filtered_kname=${filtered_kname/\./_} |
| 19 |
- |
| 20 |
-eval "clst_initramfs_overlay=\$clst_boot_kernel_${filtered_kname}_initramfs_overlay" |
| 21 |
-eval "clst_kernel_merge=\$clst_boot_kernel_${filtered_kname}_packages" |
| 22 |
-eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use" |
| 23 |
-eval eval clst_kernel_gk_kernargs=( \$clst_boot_kernel_${filtered_kname}_gk_kernargs ) |
| 24 |
-eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources" |
| 25 |
+eval "clst_initramfs_overlay=\$clst_boot_kernel_${kname}_initramfs_overlay" |
| 26 |
+eval "clst_kernel_merge=\$clst_boot_kernel_${kname}_packages" |
| 27 |
+eval "clst_kernel_use=\$clst_boot_kernel_${kname}_use" |
| 28 |
+eval eval clst_kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs ) |
| 29 |
+eval "clst_ksource=\$clst_boot_kernel_${kname}_sources" |
| 30 |
|
| 31 |
if [ -z "${clst_ksource}" ] |
| 32 |
then |
| 33 |
-- |
| 34 |
2.26.2 |
Archives