summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-05 12:25:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-05 16:32:15 (GMT)
commit2000698b17011bbde1c3e5bb01a7d6763316db5a (patch)
tree5080d6d280487d6a8341c18ae56706e5157a0823
parent9d6630d1749486e38066650e1de5849c9524adbc (diff)
downloadpoky-2000698b17011bbde1c3e5bb01a7d6763316db5a.tar.gz
meta-yocto: Split into distro and bsp components
Now we have settled on best practises and compliance criteria, bring meta-yocto into compliance by separating out the hardware support components into meta-yocto-bsp leaving policy configuration in meta-yocto. Also rename the meta-yocto scripts directory to OE-Core can be a clearly isolated component in poky. (From meta-yocto rev: eac90e27a032ea23d9a4f35c7eef8b1940c80e22) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/conf/layer.conf11
-rw-r--r--meta-yocto-bsp/conf/machine/atom-pc.conf (renamed from meta-yocto/conf/machine/atom-pc.conf)0
-rw-r--r--meta-yocto-bsp/conf/machine/beagleboard.conf (renamed from meta-yocto/conf/machine/beagleboard.conf)0
-rw-r--r--meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf (renamed from meta-yocto/conf/machine/mpc8315e-rdb.conf)0
-rw-r--r--meta-yocto-bsp/conf/machine/routerstationpro.conf (renamed from meta-yocto/conf/machine/routerstationpro.conf)0
-rw-r--r--meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state.bbappend (renamed from meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state (renamed from meta-yocto/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state)0
-rw-r--r--meta-yocto-bsp/recipes-bsp/formfactor/formfactor/atom-pc/machconfig (renamed from meta-yocto/recipes-bsp/formfactor/formfactor/atom-pc/machconfig)0
-rwxr-xr-xmeta-yocto-bsp/recipes-bsp/formfactor/formfactor/beagleboard/machconfig (renamed from meta-yocto/recipes-bsp/formfactor/formfactor/beagleboard/machconfig)0
-rw-r--r--meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend (renamed from meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-core/netbase/netbase-5.0/beagleboard/interfaces (renamed from meta-yocto/recipes-core/netbase/netbase-5.0/beagleboard/interfaces)0
-rw-r--r--meta-yocto-bsp/recipes-core/netbase/netbase_5.0.bbappend (renamed from meta-yocto/recipes-core/netbase/netbase_5.0.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend (renamed from meta-yocto/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine (renamed from meta-yocto/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine)0
-rw-r--r--meta-yocto-bsp/recipes-core/uclibc/uclibc_git.bbappend (renamed from meta-yocto/recipes-core/uclibc/uclibc_git.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend (renamed from meta-yocto/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend (renamed from meta-yocto/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend (renamed from meta-yocto/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_git.bbappend (renamed from meta-yocto/recipes-graphics/mesa/mesa-dri_git.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf (renamed from meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf)0
-rw-r--r--meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf (renamed from meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf)0
-rw-r--r--meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend (renamed from meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend (renamed from meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend (renamed from meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.2.bbappend (renamed from meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend (renamed from meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend)0
-rw-r--r--meta-yocto-bsp/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend (renamed from meta-yocto/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend)0
-rw-r--r--meta-yocto/conf/bblayers.conf.sample3
-rw-r--r--meta-yocto/conf/distro/poky.conf1
29 files changed, 14 insertions, 1 deletions
diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf
new file mode 100644
index 0000000..49fb135
--- /dev/null
+++ b/meta-yocto-bsp/conf/layer.conf
@@ -0,0 +1,11 @@
1# We have a conf and classes directory, add to BBPATH
2BBPATH := "${BBPATH}:${LAYERDIR}"
3
4# We have a packages directory, add to BBFILES
5BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
6 ${LAYERDIR}/recipes-*/*/*.bbappend"
7
8BBFILE_COLLECTIONS += "yoctobsp"
9BBFILE_PATTERN_yoctobsp := "^${LAYERDIR}/"
10BBFILE_PRIORITY_yoctobsp = "5"
11
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto-bsp/conf/machine/atom-pc.conf
index 46bc71b..46bc71b 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto-bsp/conf/machine/atom-pc.conf
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf
index aa8fa07..aa8fa07 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index 266f9d4..266f9d4 100644
--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto-bsp/conf/machine/routerstationpro.conf
index 707392d..707392d 100644
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto-bsp/conf/machine/routerstationpro.conf
diff --git a/meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state.bbappend
index 72d991c..72d991c 100644
--- a/meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state.bbappend
diff --git a/meta-yocto/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state b/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state
index f924491..f924491 100644
--- a/meta-yocto/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state
+++ b/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state
diff --git a/meta-yocto/recipes-bsp/formfactor/formfactor/atom-pc/machconfig b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/atom-pc/machconfig
index bef4ce3..bef4ce3 100644
--- a/meta-yocto/recipes-bsp/formfactor/formfactor/atom-pc/machconfig
+++ b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/atom-pc/machconfig
diff --git a/meta-yocto/recipes-bsp/formfactor/formfactor/beagleboard/machconfig b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
index a46859f..a46859f 100755
--- a/meta-yocto/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
+++ b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
diff --git a/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 72d991c..72d991c 100644
--- a/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
diff --git a/meta-yocto/recipes-core/netbase/netbase-5.0/beagleboard/interfaces b/meta-yocto-bsp/recipes-core/netbase/netbase-5.0/beagleboard/interfaces
index b6935c1..b6935c1 100644
--- a/meta-yocto/recipes-core/netbase/netbase-5.0/beagleboard/interfaces
+++ b/meta-yocto-bsp/recipes-core/netbase/netbase-5.0/beagleboard/interfaces
diff --git a/meta-yocto/recipes-core/netbase/netbase_5.0.bbappend b/meta-yocto-bsp/recipes-core/netbase/netbase_5.0.bbappend
index 5622303..5622303 100644
--- a/meta-yocto/recipes-core/netbase/netbase_5.0.bbappend
+++ b/meta-yocto-bsp/recipes-core/netbase/netbase_5.0.bbappend
diff --git a/meta-yocto/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
index 352c1f9..352c1f9 100644
--- a/meta-yocto/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
+++ b/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
diff --git a/meta-yocto/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine b/meta-yocto-bsp/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine
index 5df15f9..5df15f9 100644
--- a/meta-yocto/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine
+++ b/meta-yocto-bsp/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine
diff --git a/meta-yocto/recipes-core/uclibc/uclibc_git.bbappend b/meta-yocto-bsp/recipes-core/uclibc/uclibc_git.bbappend
index 72d991c..72d991c 100644
--- a/meta-yocto/recipes-core/uclibc/uclibc_git.bbappend
+++ b/meta-yocto-bsp/recipes-core/uclibc/uclibc_git.bbappend
diff --git a/meta-yocto/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend b/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend
index 0105ade..0105ade 100644
--- a/meta-yocto/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend
+++ b/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend
diff --git a/meta-yocto/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend b/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend
index 0105ade..0105ade 100644
--- a/meta-yocto/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend
+++ b/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend
diff --git a/meta-yocto/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend b/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
index 7e8e773..7e8e773 100644
--- a/meta-yocto/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
+++ b/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
diff --git a/meta-yocto/recipes-graphics/mesa/mesa-dri_git.bbappend b/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_git.bbappend
index 61d3891..61d3891 100644
--- a/meta-yocto/recipes-graphics/mesa/mesa-dri_git.bbappend
+++ b/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_git.bbappend
diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
index e18b911..e18b911 100644
--- a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
+++ b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf
index 0335e6a..0335e6a 100644
--- a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf
+++ b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf
diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 72d991c..72d991c 100644
--- a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
index 274eb82..274eb82 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 9641336..9641336 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.2.bbappend
index fa160f8..fa160f8 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.2.bbappend
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
index e9a6d9d..e9a6d9d 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
diff --git a/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend b/meta-yocto-bsp/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
index 0c948bc..0c948bc 100644
--- a/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
+++ b/meta-yocto-bsp/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
diff --git a/meta-yocto/conf/bblayers.conf.sample b/meta-yocto/conf/bblayers.conf.sample
index edbccf0..98bfd70 100644
--- a/meta-yocto/conf/bblayers.conf.sample
+++ b/meta-yocto/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
1# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 1# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
2# changes incompatibly 2# changes incompatibly
3LCONF_VERSION = "5" 3LCONF_VERSION = "6"
4 4
5BBPATH = "${TOPDIR}" 5BBPATH = "${TOPDIR}"
6BBFILES ?= "" 6BBFILES ?= ""
@@ -8,4 +8,5 @@ BBFILES ?= ""
8BBLAYERS ?= " \ 8BBLAYERS ?= " \
9 ##COREBASE##/meta \ 9 ##COREBASE##/meta \
10 ##COREBASE##/meta-yocto \ 10 ##COREBASE##/meta-yocto \
11 ##COREBASE##/meta-yocto-bsp \
11 " 12 "
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 5409a77..6897ac4 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -9,6 +9,7 @@ MAINTAINER = "Poky <poky@yoctoproject.org>"
9TARGET_VENDOR = "-poky" 9TARGET_VENDOR = "-poky"
10 10
11LOCALCONF_VERSION = "1" 11LOCALCONF_VERSION = "1"
12LAYER_CONF_VERSION ?= "6"
12 13
13DISTRO_FEATURES_append = " largefile opengl" 14DISTRO_FEATURES_append = " largefile opengl"
14 15