From 8d84e9d25ace096edd6d6eeb5ba9d1fa5b1252ad Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 7 Oct 2013 15:23:35 -0500
Subject: [PATCH] ARM: Don't install or deal with in templates, no longer
 existing kernels

remove no longer used kernel variants from templates
dont try to install no longer existing kernel-tegra variant
---
 share/arm.tmpl             | 1 -
 share/live/arm.tmpl        | 7 +------
 share/runtime-install.tmpl | 2 +-
 src/pylorax/treebuilder.py | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/share/arm.tmpl b/share/arm.tmpl
index 637e13fd..5fef2836 100644
--- a/share/arm.tmpl
+++ b/share/arm.tmpl
@@ -10,7 +10,6 @@ LIVEDIR="LiveOS"
 # include a 'baseline' kernel for no 'flavor'.
 kernelAddress = { 'baseline' : '0x00008000',
                   'lpae'     : '0x00008000',
-                  'tegra'    : '0x00008000',
                 }
 
 # keep a comma-delimited list of platforms installed to add to .treeinfo
diff --git a/share/live/arm.tmpl b/share/live/arm.tmpl
index bf6eef95..4c41d51c 100644
--- a/share/live/arm.tmpl
+++ b/share/live/arm.tmpl
@@ -9,12 +9,7 @@ LIVEDIR="LiveOS"
 # different platforms use different kernel load addresses.
 # include a 'baseline' kernel for no 'flavor'.
 kernelAddress = { 'baseline' : '0x00008000',
-                  'highbank' : '0x00008000',
-                  'imx'      : '0x90008000',
-                  'kirkwood' : '0x00008000',
-                  'mvebu'    : '0x00008000',
-                  'omap'     : '0x80008000',
-                  'tegra'    : '0x00008000',
+                  'lpae'     : '0x00008000',
                 }
 %>
 
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 0f63b944..547ce89e 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -22,7 +22,7 @@ installpkg grubby
 
 ## arch-specific packages (bootloaders etc.)
 %if basearch in ("arm", "armhfp"):
-    installpkg kernel-lpae kernel-tegra
+    installpkg kernel-lpae
     installpkg uboot-tools
 %endif
 %if basearch == "i386":
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index 42e726f4..31064832 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -264,7 +264,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', 'lpae', 'tegra')
+    flavors = ('debug', 'PAE', 'PAEdebug', 'smp', 'xen', 'lpae')
     kre = re.compile(r"vmlinuz-(?P<version>.+?\.(?P<arch>[a-z0-9_]+)"
                      r"(.(?P<flavor>{0}))?)$".format("|".join(flavors)))
     kernels = []