From f921a362f9ffae8600dfa10f34d47b34d655e3b6 Mon Sep 17 00:00:00 2001
From: "d.marlin" <dmarlin@redhat.com>
Date: Fri, 25 Jan 2013 19:35:24 -0600
Subject: [PATCH] Dynamically generate the list of installed platforms for
 .treeinfo

The list of ARM platforms was represented as a static list to be
installed in .treeinfo for Beaker support, but as ARM moves to use
the multiplatform kernel the platform specific kernel images will
no longer be needed.  This process is beginning in F18 (3.7 kernel)
with HighBank being the first to use the baseline kernel.  Due to
this change, there will be no 'highbank' platform images, but Beaker
tries to import all platforms listed in .treeinfo.  To avoid errors,
we should dynamically create the list of ARM plaforms, including
only those that are actually provided.

Signed-off-by: David A. Marlin <dmarlin@redhat.com>
---
 share/arm.tmpl | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/share/arm.tmpl b/share/arm.tmpl
index bdad59ae..610d113c 100644
--- a/share/arm.tmpl
+++ b/share/arm.tmpl
@@ -16,21 +16,26 @@ kernelAddress = { 'baseline' : '0x00008000',
                   'omap'     : '0x80008000',
                   'tegra'    : '0x00008000',
                 }
+
+# keep a comma-delimited list of platforms installed to add to .treeinfo
+platforms = ""
+delimiter = ''
 %>
 
 mkdir ${LIVEDIR}
 install ${runtime_img} ${LIVEDIR}/squashfs.img
 treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
 
-# Add platforms to treeinfo for Beaker support.
-treeinfo ${basearch} platforms highbank,imx,mvebu,omap,tegra
-
 ## install kernels
 mkdir ${KERNELDIR}
 %for kernel in kernels:
     %if kernel.flavor:
         installkernel images-${kernel.flavor}-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
         installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
+<%
+        platforms = platforms + delimiter + kernel.flavor
+        delimiter = ','
+%>
 
         %if doupgrade:
             ## install upgrade image
@@ -107,6 +112,9 @@ mkdir ${KERNELDIR}
     %endif
 %endfor
 
+# add platform to treeinfo for Beaker support
+treeinfo ${basearch} platforms ${platforms}
+
 
 ## FIXME: ARM may need some extra boot config