Skip to contentSkip to conversation

meta-intel: minor layer fixes

PATCH Applied Paul Eggleton 2 participants 4 messages Jun 2, 2011

lore
Share & tools
lore
#0 lore raw

cover meta-intel: minor layer fixes

A couple of minor things I uncovered whilst working on the layer tools.

Paul Eggleton (2):
meta-emenlow: remove obsolete bbappends
meta-crownbay: tidy up layer configuration

 meta-crownbay/conf/layer.conf                      |    6 +-----
 .../clutter/clutter-1.4_1.4.2.bbappend             |    4 ----
 .../recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend     |    2 --
 3 files changed, 1 insertions(+), 11 deletions(-)
 delete mode 100644 meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
 delete mode 100644 meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/2 meta-emenlow: remove obsolete bbappends

Qt 4.6.3 and Clutter 1.4 have been removed from oe-core / poky.

---
 .../clutter/clutter-1.4_1.4.2.bbappend             |    4 ----
 .../recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend     |    2 --
 2 files changed, 0 insertions(+), 6 deletions(-)
 delete mode 100644 meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
 delete mode 100644 meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend
meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend deleted +0 -4
deleted file mode 100644
index 71677ad..0000000
@@ -1,4 +0,0 @@
-DEPENDS_emenlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
-EXTRA_OECONF_emenlow = "${BASE_CONF} --with-flavour=glx"
-PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
-
meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend deleted +0 -2
deleted file mode 100644
index 92eabf2..0000000
@@ -1,2 +0,0 @@
-QT_GLFLAGS_emenlow = "-opengl"
-
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 2/2 meta-crownbay: tidy up layer configuration

In reply to Paul Eggleton

* We can't use machine overrides in layer.conf because MACHINE is not defined yet (local.conf has not yet been parsed) so remove these
* In light of the above having a separate collection configured for crownbay-noemgd no longer does anything, so remove it as well.

---
 meta-crownbay/conf/layer.conf |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
meta-crownbay/conf/layer.conf +1 -5
index 4ffeb2c..9c3794b 100644
@@ -7,10 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/../common/recipes-*/*/*.bb \
 	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS_append_crownbay += "crownbay"
+BBFILE_COLLECTIONS += "crownbay"
 BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
 BBFILE_PRIORITY_crownbay = "6"
-
-BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd"
-BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/"
-BBFILE_PRIORITY_crownbay-noemgd = "6"
Signature · 1 line
1.7.4.1
Acked-by on the v1 series Applied
#3 lore raw
In reply to Paul Eggleton
Quoted 6 lines · Paul Eggleton

A couple of minor things I uncovered whilst working on the layer tools.

Paul Eggleton (2):
meta-emenlow: remove obsolete bbappends
meta-crownbay: tidy up layer configuration

Quoted 7 lines
 meta-crownbay/conf/layer.conf                      |    6 +-----
 .../clutter/clutter-1.4_1.4.2.bbappend             |    4 ----
 .../recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend     |    2 --
 3 files changed, 1 insertions(+), 11 deletions(-)
 delete mode 100644 meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
 delete mode 100644 meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend

Applied to meta-intel/master.

Thanks, Paul!