intel-corei7-64: Initial commit for warrior

Update the images content and layer config.

Change-Id: Ifaec93db95421d58a348c5dd7c3df95405a6c66b
Signed-off-by: Adrian Mangeac <Adrian.Mangeac@enea.com>

5 files changed, 4 insertions, 22 deletions

diff --git a/README b/README
index a45bdd2..eaee158 100644
--- a/README
+++ b/README
@@ -10,10 +10,10 @@ Dependencies
 This layer depends on:
 
   URI: git://git.yoctoproject.org/poky
-  branch: pyro
+  branch: warrior
 
   URI: git://git.enea.com/linux/meta-el-common
-  branch: pyro
+  branch: warrior
 
 
 Source code
diff --git a/conf/layer.conf b/conf/layer.conf
index 90147d3..8fc992c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,4 +12,4 @@ BBFILE_PATTERN_el-standard = "^${LAYERDIR}/"
 BBFILE_PRIORITY_el-standard = "7"
 LAYERDEPENDS_el-standard = "el-common"
 
-LAYERSERIES_COMPAT_el-standard = "sumo"
+# LAYERSERIES_COMPAT_el-standard = "warrior"
diff --git a/conf/template.intel-corei7-64/bblayers.conf.sample b/conf/template.intel-corei7-64/bblayers.conf.sample
index 7f3ced1..a464959 100644
--- a/conf/template.intel-corei7-64/bblayers.conf.sample
+++ b/conf/template.intel-corei7-64/bblayers.conf.sample
@@ -17,5 +17,4 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-filesystems \
   ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-qt5 \
   "
diff --git a/conf/template.intel-corei7-64/local.conf.sample b/conf/template.intel-corei7-64/local.conf.sample
index 6288054..686809b 100644
--- a/conf/template.intel-corei7-64/local.conf.sample
+++ b/conf/template.intel-corei7-64/local.conf.sample
@@ -243,7 +243,4 @@ IMAGE_FSTYPES_remove = " wic"
 # Remove Intel Microcode 
 MACHINE_FEATURES_remove = "intel-ucode"
 
-PACKAGECONFIG_DISTRO_pn-qtbase = "accessibility eglfs fontconfig gles2 glib examples"
-
 DISTRO_FEATURES_remove = " x11"
-DISTRO_FEATURES_append = " wayland alsa"
diff --git a/images/enea-image-standard-common.inc b/images/enea-image-standard-common.inc
index d580e0a..d4eff75 100644
--- a/images/enea-image-standard-common.inc
+++ b/images/enea-image-standard-common.inc
@@ -2,21 +2,7 @@ require images/enea-image-common.inc
 
 IMAGE_INSTALL += " \
     python3 \
-    packagegroup-base-alsa \
     rt-tests \
-    nodejs \
-    weston \
-    qtbase \ 
-    qtwayland \
-    qtbase-plugins \
-    qtbase-tools \
-    qtmultimedia \
-    qtmultimedia-plugins \
-    qtmultimedia-examples \
-    qtmultimedia-qmlplugins \
-    cinematicexperience \
     "
 
-IMAGE_FEATURES += "hwcodecs"
-
-CORE_IMAGE_EXTRA_INSTALL_append = " wayland weston kernel-modules"
+CORE_IMAGE_EXTRA_INSTALL_append = " kernel-modules"