From f170b6dc49d0aa48f0d80310f9cf0912da1af279 Mon Sep 17 00:00:00 2001
From: "d.marlin" <dmarlin@redhat.com>
Date: Wed, 25 Jul 2012 03:41:08 -0500
Subject: [PATCH] Add 'mvebu' to list of recognized ARM kernels.

Signed-off-by: David A. Marlin <dmarlin@redhat.com>
---
 share/arm.tmpl             | 1 +
 share/runtime-install.tmpl | 2 +-
 src/pylorax/treebuilder.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/arm.tmpl b/share/arm.tmpl
index a6817f40..bf6eef95 100644
--- a/share/arm.tmpl
+++ b/share/arm.tmpl
@@ -12,6 +12,7 @@ kernelAddress = { 'baseline' : '0x00008000',
                   'highbank' : '0x00008000',
                   'imx'      : '0x90008000',
                   'kirkwood' : '0x00008000',
+                  'mvebu'    : '0x00008000',
                   'omap'     : '0x80008000',
                   'tegra'    : '0x00008000',
                 }
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 8e042fb4..8398cde3 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -23,7 +23,7 @@ installpkg kernel
 
 ## arch-specific packages (bootloaders etc.)
 %if basearch in ("arm", "armhfp"):
-    installpkg kernel-highbank kernel-imx kernel-kirkwood kernel-omap kernel-tegra
+    installpkg kernel-highbank kernel-imx kernel-kirkwood kernel-mvebu kernel-omap kernel-tegra
     installpkg uboot-tools
 %endif
 %if basearch == "i386":
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index 64ef3b92..3061f154 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -259,7 +259,7 @@ class TreeBuilder(object):
 
 def findkernels(root="/", kdir="boot"):
     # To find possible flavors, awk '/BuildKernel/ { print $4 }' kernel.spec
-    flavors = ('debug', 'PAE', 'PAEdebug', 'smp', 'xen', 'highbank', 'imx', 'kirkwood', 'omap', 'tegra')
+    flavors = ('debug', 'PAE', 'PAEdebug', 'smp', 'xen', 'highbank', 'imx', 'kirkwood', 'mvebu', 'omap', 'tegra')
     kre = re.compile(r"vmlinuz-(?P<version>.+?\.(?P<arch>[a-z0-9_]+)"
                      r"(\.(?P<flavor>{0}))?)$".format("|".join(flavors)))
     kernels = []