From 7d848c27c76b48442df23e5aeb174573f0aba6c5 Mon Sep 17 00:00:00 2001
From: Thomas Lundström <thomas.lundstrom@enea.com>
Date: Tue, 26 Apr 2016 15:34:10 +0200
Subject: Introduced common manifest include file

---
 common/common_manifest.xml       | 14 ++++++++++++++
 ls1021atwr/manifest_template.xml | 16 +++-------------
 p2041rdb/manifest_template.xml   | 11 ++---------
 qemuarm/manifest_template.xml    | 11 ++---------
 qemuppc/manifest_template.xml    | 11 ++---------
 qemux86/manifest_template.xml    | 11 ++---------
 6 files changed, 25 insertions(+), 49 deletions(-)
 create mode 100644 common/common_manifest.xml

diff --git a/common/common_manifest.xml b/common/common_manifest.xml
new file mode 100644
index 0000000..6f3f65c
--- /dev/null
+++ b/common/common_manifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <!--Common parts of the manifest template for standard profile -->
+
+  <remote name="git-enea" fetch="git://git.enea.se/"/>
+  
+  <default revision="krogoth" remote="git-enea"/>
+  
+  <project name="linux/poky"                  path="poky"/>
+  <project name="linux/meta-openembedded"     path="poky/meta-openembedded"/>
+  <project name="linux/meta-el-common"        path="poky/meta-el-common"/>
+  <project name="linux/meta-el-standard"      path="poky/meta-el-standard"/>
+  <project name="linux/meta-enea-bsp-common"  path="poky/meta-enea-bsp-common"/>
+</manifest>
diff --git a/ls1021atwr/manifest_template.xml b/ls1021atwr/manifest_template.xml
index fb13206..df9cb42 100644
--- a/ls1021atwr/manifest_template.xml
+++ b/ls1021atwr/manifest_template.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!--Manifest template for LS1021ATWR -->
-
-  <remote name="git-enea" fetch="git://git.enea.se/"/>
   
-  <default revision="krogoth" remote="git-enea"/>
+  <include name="common/common_manifest.xml"/>
   
-  <project name="linux/poky"                  path="poky"/>
-  <project name="linux/meta-openembedded"     path="poky/meta-openembedded"/>
-  <project name="linux/meta-el-common"        path="poky/meta-el-common"/>
-  <project name="linux/meta-el-standard"      path="poky/meta-el-standard">
+  <project name="linux/meta-enea-base-arm"    path="poky/meta-enea-base-arm">
     <linkfile src="../../.repo/manifests/ls1021atwr/README" dest="README"/>
   </project>
-  <project name="linux/meta-enea-base-arm"    path="poky/meta-enea-base-arm"/>
-  <project name="linux/meta-enea-bsp-common"  path="poky/meta-enea-bsp-common"/>
   <project name="linux/meta-enea-bsp-arm"     path="poky/meta-enea-bsp-arm"/>
-  <project
-      name="linux/meta-fsl-arm"
-      path="poky/meta-fsl-arm"
-      revision="master"/>
+  <project name="linux/meta-fsl-arm"          path="poky/meta-fsl-arm"/>
 </manifest>
diff --git a/p2041rdb/manifest_template.xml b/p2041rdb/manifest_template.xml
index fe91a21..4a9adf3 100644
--- a/p2041rdb/manifest_template.xml
+++ b/p2041rdb/manifest_template.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!--Manifest template for P2041RDB -->
-
-  <remote name="git-enea" fetch="git://git.enea.se/"/>
   
-  <default revision="krogoth" remote="git-enea"/>
+  <include name="common/common_manifest.xml"/>
   
-  <project name="linux/poky"                  path="poky"/>
-  <project name="linux/meta-openembedded"     path="poky/meta-openembedded"/>
-  <project name="linux/meta-el-common"        path="poky/meta-el-common"/>
-  <project name="linux/meta-el-standard"      path="poky/meta-el-standard">
+  <project name="linux/meta-enea-base-ppc"    path="poky/meta-enea-base-ppc">
     <linkfile src="../../.repo/manifests/p2041rdb/README" dest="README"/>
   </project>
-  <project name="linux/meta-enea-base-ppc"    path="poky/meta-enea-base-ppc"/>
-  <project name="linux/meta-enea-bsp-common"  path="poky/meta-enea-bsp-common"/>
   <project name="linux/meta-enea-bsp-ppc"     path="poky/meta-enea-bsp-ppc"/>
   <project name="linux/meta-fsl-ppc"          path="poky/meta-fsl-ppc"/>
 </manifest>
diff --git a/qemuarm/manifest_template.xml b/qemuarm/manifest_template.xml
index 3a56d28..bde1ed6 100644
--- a/qemuarm/manifest_template.xml
+++ b/qemuarm/manifest_template.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!--Manifest template for Qemu, arm -->
-
-  <remote name="git-enea" fetch="git://git.enea.se/"/>
   
-  <default revision="krogoth" remote="git-enea"/>
+  <include name="common/common_manifest.xml"/>
   
-  <project name="linux/poky"                  path="poky"/>
-  <project name="linux/meta-openembedded"     path="poky/meta-openembedded"/>
-  <project name="linux/meta-el-common"        path="poky/meta-el-common"/>
-  <project name="linux/meta-el-standard"      path="poky/meta-el-standard">
+  <project name="linux/meta-enea-base-arm"    path="poky/meta-enea-base-arm">
     <linkfile src="../../.repo/manifests/qemuarm/README" dest="README"/>
   </project>
-  <project name="linux/meta-enea-base-arm"    path="poky/meta-enea-base-arm"/>
-  <project name="linux/meta-enea-bsp-common"  path="poky/meta-enea-bsp-common"/>
 </manifest>
diff --git a/qemuppc/manifest_template.xml b/qemuppc/manifest_template.xml
index 57596dc..1fb62ae 100644
--- a/qemuppc/manifest_template.xml
+++ b/qemuppc/manifest_template.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!--Manifest template for Qemu, ppc -->
-
-  <remote name="git-enea" fetch="git://git.enea.se/"/>
   
-  <default revision="krogoth" remote="git-enea"/>
+  <include name="common/common_manifest.xml"/>
   
-  <project name="linux/poky"                  path="poky"/>
-  <project name="linux/meta-openembedded"     path="poky/meta-openembedded"/>
-  <project name="linux/meta-el-common"        path="poky/meta-el-common"/>
-  <project name="linux/meta-el-standard"      path="poky/meta-el-standard">
+  <project name="linux/meta-enea-base-ppc"    path="poky/meta-enea-base-ppc">
     <linkfile src="../../.repo/manifests/qemuppc/README" dest="README"/>
   </project>
-  <project name="linux/meta-enea-base-ppc"    path="poky/meta-enea-base-ppc"/>
-  <project name="linux/meta-enea-bsp-common"  path="poky/meta-enea-bsp-common"/>
 </manifest>
diff --git a/qemux86/manifest_template.xml b/qemux86/manifest_template.xml
index 08e1dbe..6798b61 100644
--- a/qemux86/manifest_template.xml
+++ b/qemux86/manifest_template.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!--Manifest template for Qemu, x86 -->
-
-  <remote name="git-enea" fetch="git://git.enea.se/"/>
   
-  <default revision="krogoth" remote="git-enea"/>
+  <include name="common/common_manifest.xml"/>
   
-  <project name="linux/poky"                  path="poky"/>
-  <project name="linux/meta-openembedded"     path="poky/meta-openembedded"/>
-  <project name="linux/meta-el-common"        path="poky/meta-el-common"/>
-  <project name="linux/meta-el-standard"      path="poky/meta-el-standard">
+  <project name="linux/meta-enea-base-x86"    path="poky/meta-enea-base-x86">
     <linkfile src="../../.repo/manifests/qemux86/README" dest="README"/>
   </project>
-  <project name="linux/meta-enea-base-x86"    path="poky/meta-enea-base-x86"/>
-  <project name="linux/meta-enea-bsp-common"  path="poky/meta-enea-bsp-common"/>
 </manifest>
-- 
cgit v1.2.3-54-g00ecf