[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, examples/, targets/support/, livecd/cdtar/, doc/

[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, examples/, targets/support/, livecd/cdtar/, doc/

[Matt Turner]

commit:     34a82f07bd3e0f968c99369e794db4dc8c747b38
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 07:25:05 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 07:33:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=34a82f07

Remove yaboot leftovers

GRUB replaced yaboot on PPC in commit e9c0a0394d15 (ppc: Generate Grub
entries)

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py               |   1 -
 doc/catalyst-spec.5.txt                  |   6 ------
 examples/livecd-stage2_template.spec     |   6 ------
 livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 | Bin 51088 -> 0 bytes
 targets/support/bootloader-setup.sh      |   1 -
 5 files changed, 14 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index d29b48fc..d2b4cd94 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -662,7 +662,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
 				self.valid_values.append("boot/kernel/" + x + "/gk_action")
 				self.valid_values.append("boot/kernel/" + x + "/gk_kernargs")
 				self.valid_values.append("boot/kernel/" + x + "/initramfs_overlay")
-				self.valid_values.append("boot/kernel/" + x + "/machine_type")
 				self.valid_values.append("boot/kernel/" + x + "/sources")
 				self.valid_values.append("boot/kernel/" + x + "/softlevel")
 				self.valid_values.append("boot/kernel/" + x + "/use")

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 250acded..6c71b57b 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -264,12 +264,6 @@ sources to keep the modules from overwriting each other.  We do not
 use this on the official media.  `<label>` should match one of the
 labels given to *boot/kernel*.
 
-*boot/kernel/<label>/machine_type*::
-This option is only for ppc64 machines (example: `ibm`).  If used it
-will create the `/etc/yaboot.conf` entry used for booting an ibm
-powerpc machine.  `<label>` should match one of the labels given to
-*boot/kernel*.
-
 *boot/kernel/<label>/console*::
 This is only supported on ppc64 currently.  This entry sets up the
 console boot parameters required for sending the output to the

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index 7dd64c3f..fe9b36e7 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -317,12 +317,6 @@ boot/kernel/gentoo/extraversion:
 # boot/kernel/gentoo/packages: pcmcia-cs speedtouch slmodem globespan-adsl hostap-driver hostap-utils ipw2100 ipw2200 fritzcapi fcdsl cryptsetup
 boot/kernel/gentoo/packages:
 
-# This option is only for ppc64 machines.  If used it will create the /etc/yaboot.conf
-# entry used for booting a ibm powerpc machine.
-# example:
-# boot/kernel/gentoo/machine_type: ibm
-boot/kernel/gentoo/machine_type:
-
 # This is only supported on ppc64 currently.  This entry sets up the console=
 # boot parameters required for sending the output to the appropriate console.
 # example:

diff --git a/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 b/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
deleted file mode 100644
index a4bec73b..00000000
Binary files a/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 and /dev/null differ

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index e4735782..68e1355e 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -93,7 +93,6 @@ case ${clst_hostarch} in
 		for x in ${clst_boot_kernel}
 		do
 			eval "clst_kernel_console=\$clst_boot_kernel_${x}_console"
-			eval "clst_kernel_machine_type=\$clst_boot_kernel_${x}_machine_type"
 			eval custom_kopts=\$${x}_kernelopts
 
 			echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}