Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/
Date: Sun, 30 Jan 2022 20:43:04
Message-Id: 1627520853.6976c5fe167b7949c8a33edace8cd93fd87e8dcd.mattst88@gentoo
1 commit: 6976c5fe167b7949c8a33edace8cd93fd87e8dcd
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 29 01:07:33 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 29 01:07:33 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6976c5fe
7
8 targets: Remove dead custom_kopts variable
9
10 It looks like this has been dead since 2005.
11
12 Closes: https://bugs.gentoo.org/804591
13 Fixes: 1fcca247 ("Removed these as they are moved to the appropriate target directories")
14 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
15
16 targets/support/bootloader-setup.sh | 3 +--
17 1 file changed, 1 insertion(+), 2 deletions(-)
18
19 diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
20 index 4cfa61eb..a998a420 100755
21 --- a/targets/support/bootloader-setup.sh
22 +++ b/targets/support/bootloader-setup.sh
23 @@ -31,7 +31,7 @@ case ${clst_fstype} in
24 esac
25
26
27 -default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} ${custom_kopts} cdroot)
28 +default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} cdroot)
29
30 case ${clst_hostarch} in
31 alpha)
32 @@ -99,7 +99,6 @@ case ${clst_hostarch} in
33 for x in ${clst_boot_kernel}
34 do
35 eval "kernel_console=\$clst_boot_kernel_${x}_console"
36 - eval custom_kopts=\$${x}_kernelopts
37
38 echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg}
39 echo " linux ${kern_subdir}/${x} ${default_append_line[@]}" >> ${iacfg}