diff --git a/meta-citadel/conf/layer.conf b/meta-citadel/conf/layer.conf index 0bb6baf..09b85bf 100644 --- a/meta-citadel/conf/layer.conf +++ b/meta-citadel/conf/layer.conf @@ -14,7 +14,7 @@ BBFILE_COLLECTIONS += "citadel" BBFILE_PATTERN_citadel = "^${LAYERDIR}/" BBFILE_PRIORITY_citadel = "5" -LAYERSERIES_COMPAT_citadel = "langdale" +LAYERSERIES_COMPAT_citadel = "mickledore" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 84c35a8..56c0d22 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -1,7 +1,7 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -LAYERSERIES_COMPAT_meta-gnome = "langdale" +LAYERSERIES_COMPAT_meta-gnome = "mickledore" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ diff --git a/meta-intel b/meta-intel index 323fee2..a0ea4e5 160000 --- a/meta-intel +++ b/meta-intel @@ -1 +1 @@ -Subproject commit 323fee2ce0efd8f3f152236d973b80f79eb3933a +Subproject commit a0ea4e5d395579e70f1057f1f1222c8a2b55bd96 diff --git a/poky b/poky index 5200799..aa63b25 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 5200799866b92259e855051112520006e1aaaac0 +Subproject commit aa63b25cbe25d89ab07ca11ee72c17cab68df8de