No subject

[Adam Conrad]

>From 829b59254cfbe6cdf20d790cf32a3846923703f0 Mon Sep 17 00:00:00 2001
From: Adam Conrad <adconrad at 0c3.net>
Date: Wed, 26 Mar 2014 14:41:58 -0600
Subject: [PATCH] UBUNTU: [Packaging] Set bootloader and loader on ppc64el to
 grub

---
 debian.master/control.d/vars.generic | 2 +-
 debian.master/rules.d/ppc64el.mk     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index 5489337..7f029cf 100644
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -2,5 +2,5 @@ arch="i386 amd64 armhf arm64 ppc64el"
 supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
-bootloader="grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64]"
+bootloader="grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
 provides="kvm-api-4, redhat-cluster-modules, ivtv-modules"
diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk
index abb4a78..94ffba6 100644
--- a/debian.master/rules.d/ppc64el.mk
+++ b/debian.master/rules.d/ppc64el.mk
@@ -7,7 +7,7 @@ build_image	= vmlinux.strip
 kernel_file     = arch/powerpc/boot/vmlinux.strip
 install_file	= vmlinux
 no_dumpfile	= true
-loader		= yaboot
+loader		= grub
 do_extras_package = true
 
 do_tools_cpupower = true
-- 
1.9.1