1 |
commit: 34a82f07bd3e0f968c99369e794db4dc8c747b38 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 28 07:25:05 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 28 07:33:21 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=34a82f07 |
7 |
|
8 |
Remove yaboot leftovers |
9 |
|
10 |
GRUB replaced yaboot on PPC in commit e9c0a0394d15 (ppc: Generate Grub |
11 |
entries) |
12 |
|
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
catalyst/base/stagebase.py | 1 - |
16 |
doc/catalyst-spec.5.txt | 6 ------ |
17 |
examples/livecd-stage2_template.spec | 6 ------ |
18 |
livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 | Bin 51088 -> 0 bytes |
19 |
targets/support/bootloader-setup.sh | 1 - |
20 |
5 files changed, 14 deletions(-) |
21 |
|
22 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
23 |
index d29b48fc..d2b4cd94 100644 |
24 |
--- a/catalyst/base/stagebase.py |
25 |
+++ b/catalyst/base/stagebase.py |
26 |
@@ -662,7 +662,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
27 |
self.valid_values.append("boot/kernel/" + x + "/gk_action") |
28 |
self.valid_values.append("boot/kernel/" + x + "/gk_kernargs") |
29 |
self.valid_values.append("boot/kernel/" + x + "/initramfs_overlay") |
30 |
- self.valid_values.append("boot/kernel/" + x + "/machine_type") |
31 |
self.valid_values.append("boot/kernel/" + x + "/sources") |
32 |
self.valid_values.append("boot/kernel/" + x + "/softlevel") |
33 |
self.valid_values.append("boot/kernel/" + x + "/use") |
34 |
|
35 |
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt |
36 |
index 250acded..6c71b57b 100644 |
37 |
--- a/doc/catalyst-spec.5.txt |
38 |
+++ b/doc/catalyst-spec.5.txt |
39 |
@@ -264,12 +264,6 @@ sources to keep the modules from overwriting each other. We do not |
40 |
use this on the official media. `<label>` should match one of the |
41 |
labels given to *boot/kernel*. |
42 |
|
43 |
-*boot/kernel/<label>/machine_type*:: |
44 |
-This option is only for ppc64 machines (example: `ibm`). If used it |
45 |
-will create the `/etc/yaboot.conf` entry used for booting an ibm |
46 |
-powerpc machine. `<label>` should match one of the labels given to |
47 |
-*boot/kernel*. |
48 |
- |
49 |
*boot/kernel/<label>/console*:: |
50 |
This is only supported on ppc64 currently. This entry sets up the |
51 |
console boot parameters required for sending the output to the |
52 |
|
53 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec |
54 |
index 7dd64c3f..fe9b36e7 100644 |
55 |
--- a/examples/livecd-stage2_template.spec |
56 |
+++ b/examples/livecd-stage2_template.spec |
57 |
@@ -317,12 +317,6 @@ boot/kernel/gentoo/extraversion: |
58 |
# boot/kernel/gentoo/packages: pcmcia-cs speedtouch slmodem globespan-adsl hostap-driver hostap-utils ipw2100 ipw2200 fritzcapi fcdsl cryptsetup |
59 |
boot/kernel/gentoo/packages: |
60 |
|
61 |
-# This option is only for ppc64 machines. If used it will create the /etc/yaboot.conf |
62 |
-# entry used for booting a ibm powerpc machine. |
63 |
-# example: |
64 |
-# boot/kernel/gentoo/machine_type: ibm |
65 |
-boot/kernel/gentoo/machine_type: |
66 |
- |
67 |
# This is only supported on ppc64 currently. This entry sets up the console= |
68 |
# boot parameters required for sending the output to the appropriate console. |
69 |
# example: |
70 |
|
71 |
diff --git a/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 b/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 |
72 |
deleted file mode 100644 |
73 |
index a4bec73b..00000000 |
74 |
Binary files a/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 and /dev/null differ |
75 |
|
76 |
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh |
77 |
index e4735782..68e1355e 100755 |
78 |
--- a/targets/support/bootloader-setup.sh |
79 |
+++ b/targets/support/bootloader-setup.sh |
80 |
@@ -93,7 +93,6 @@ case ${clst_hostarch} in |
81 |
for x in ${clst_boot_kernel} |
82 |
do |
83 |
eval "clst_kernel_console=\$clst_boot_kernel_${x}_console" |
84 |
- eval "clst_kernel_machine_type=\$clst_boot_kernel_${x}_machine_type" |
85 |
eval custom_kopts=\$${x}_kernelopts |
86 |
|
87 |
echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg} |