4 files changed, 13 insertions, 34 deletions

diff --git a/qemux86/.README b/qemux86/.README
new file mode 100644
index 0000000..e3fdf1a
--- /dev/null
+++ b/qemux86/.README
@@ -0,0 +1,9 @@
+This file is a template used to produce the real README. Read that one instead
+
+________END_OF_HEADER________
+
+Bla bla bla ...
+
+________INSERT_BUILD_SEQUENCES_HERE________
+
+________INSERT_BOOT_SEQUENCES_HERE________
diff --git a/qemux86/README b/qemux86/README
deleted file mode 100644
index e69de29..0000000
--- a/qemux86/README
+++ /dev/null
diff --git a/qemux86/default.xml b/qemux86/default.xml
deleted file mode 100644
index 223c7d4..0000000
--- a/qemux86/default.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<manifest>
-  
-
-  <!--Snapshot of manifest_template.xml @ 2016-04-12 14:46:35 CEST-->
-
-  <remote fetch="git://git.enea.se/" name="git-enea" />
-  
-  <default remote="git-enea" revision="master" />
-  
-  <project name="linux/poky" path="poky" revision="5602f64ab8c3654737273c0e7ac1c966fa8afb6a">
-    <!--Version in template: 'krogoth' (Translated to 'refs/heads/krogoth')-->
-  </project>
-  <project name="linux/meta-openembedded" path="poky/meta-openembedded" revision="57a687bc554cc15de9fc6c17aec7a3ea9175abbd">
-    <!--Version in template: 'master' (Translated to 'refs/heads/master')-->
-  </project>
-  <project name="linux/meta-enea-base" path="poky/meta-enea-base" revision="88a73cdc79d09dc66a7767c102770258d08ac043">
-    <!--Version in template: 'master' (Translated to 'refs/heads/master')-->
-    <linkfile dest="README" src="../../.repo/manifests/qemux86/README" />
-  </project>
-  <project name="linux/meta-enea-base-x86" path="poky/meta-enea-base-x86" revision="882bd984035a645bf2a7808163ce075b4c5791f9">
-    <!--Version in template: 'master' (Translated to 'refs/heads/master')-->
-  </project>
-  <project name="linux/meta-enea-bsp-base" path="poky/meta-enea-bsp-base" revision="725726b13b3722cceb2fe2057685a8b3ca998a5e">
-    <!--Version in template: 'master' (Translated to 'refs/heads/master')-->
-</project>
-</manifest>
diff --git a/qemux86/manifest_template.xml b/qemux86/manifest_template.xml
index 5d4aa9f..fd5fe47 100644
--- a/qemux86/manifest_template.xml
+++ b/qemux86/manifest_template.xml
@@ -1,15 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!--Manifest template for Qemu, x86 -->
-
-  <remote name="git-enea" fetch="git://git.enea.se/"/>
   
-  <default revision="master" remote="git-enea"/>
+  <include name="common/common_manifest.xml"/>
   
-  <project name="linux/poky"                  path="poky" revision="krogoth"/>
-  <project name="linux/meta-openembedded"     path="poky/meta-openembedded"/>
-  <project name="linux/meta-enea-base"        path="poky/meta-enea-base">
+  <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common">
     <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-base"     path="poky/meta-enea-bsp-base"/>
+
 </manifest>