From 2000698b17011bbde1c3e5bb01a7d6763316db5a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2012 13:25:58 +0100 Subject: [PATCH] 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 --- meta-yocto-bsp/conf/layer.conf | 11 +++++++++++ .../conf/machine/atom-pc.conf | 0 .../conf/machine/beagleboard.conf | 0 .../conf/machine/mpc8315e-rdb.conf | 0 .../conf/machine/routerstationpro.conf | 0 .../recipes-bsp/alsa-state/alsa-state.bbappend | 0 .../alsa-state/alsa-state/beagleboard/asound.state | 0 .../formfactor/formfactor/atom-pc/machconfig | 0 .../formfactor/formfactor/beagleboard/machconfig | 0 .../recipes-bsp/formfactor/formfactor_0.0.bbappend | 0 .../netbase/netbase-5.0/beagleboard/interfaces | 0 .../recipes-core/netbase/netbase_5.0.bbappend | 0 .../packagegroup-core-tools-profile.bbappend | 0 .../recipes-core/uclibc/uclibc/atom-pc/uClibc.machine | 0 .../recipes-core/uclibc/uclibc_git.bbappend | 0 .../packagegroups/packagegroup-core-sdk-gmae.bbappend | 0 ...kagegroup-core-standalone-gmae-sdk-target.bbappend | 0 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 0 .../recipes-graphics/mesa/mesa-dri_git.bbappend | 0 .../xserver-xf86-config/atom-pc/xorg.conf | 0 .../xserver-xf86-config/beagleboard/xorg.conf | 0 .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 0 .../recipes-kernel/linux/linux-yocto-rt_3.0.bbappend | 0 .../recipes-kernel/linux/linux-yocto_3.0.bbappend | 0 .../recipes-kernel/linux/linux-yocto_3.2.bbappend | 0 .../recipes-kernel/linux/linux-yocto_3.4.bbappend | 0 .../recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend | 0 meta-yocto/conf/bblayers.conf.sample | 3 ++- meta-yocto/conf/distro/poky.conf | 1 + 29 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta-yocto-bsp/conf/layer.conf rename {meta-yocto => meta-yocto-bsp}/conf/machine/atom-pc.conf (100%) rename {meta-yocto => meta-yocto-bsp}/conf/machine/beagleboard.conf (100%) rename {meta-yocto => meta-yocto-bsp}/conf/machine/mpc8315e-rdb.conf (100%) rename {meta-yocto => meta-yocto-bsp}/conf/machine/routerstationpro.conf (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-bsp/alsa-state/alsa-state.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-bsp/formfactor/formfactor/atom-pc/machconfig (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-bsp/formfactor/formfactor/beagleboard/machconfig (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-bsp/formfactor/formfactor_0.0.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-core/netbase/netbase-5.0/beagleboard/interfaces (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-core/netbase/netbase_5.0.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-core/uclibc/uclibc_git.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-graphics/mesa/mesa-dri_git.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-kernel/linux/linux-yocto_3.0.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-kernel/linux/linux-yocto_3.2.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-kernel/linux/linux-yocto_3.4.bbappend (100%) rename {meta-yocto => meta-yocto-bsp}/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend (100%) diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf new file mode 100644 index 0000000000..49fb135094 --- /dev/null +++ b/meta-yocto-bsp/conf/layer.conf @@ -0,0 +1,11 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH := "${BBPATH}:${LAYERDIR}" + +# We have a packages directory, add to BBFILES +BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "yoctobsp" +BBFILE_PATTERN_yoctobsp := "^${LAYERDIR}/" +BBFILE_PRIORITY_yoctobsp = "5" + diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto-bsp/conf/machine/atom-pc.conf similarity index 100% rename from meta-yocto/conf/machine/atom-pc.conf rename to 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 similarity index 100% rename from meta-yocto/conf/machine/beagleboard.conf rename to 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 similarity index 100% rename from meta-yocto/conf/machine/mpc8315e-rdb.conf rename to 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 similarity index 100% rename from meta-yocto/conf/machine/routerstationpro.conf rename to 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 similarity index 100% rename from meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state rename to 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 similarity index 100% rename from meta-yocto/recipes-bsp/formfactor/formfactor/atom-pc/machconfig rename to 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 similarity index 100% rename from meta-yocto/recipes-bsp/formfactor/formfactor/beagleboard/machconfig rename to 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 similarity index 100% rename from meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-core/netbase/netbase-5.0/beagleboard/interfaces rename to 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 similarity index 100% rename from meta-yocto/recipes-core/netbase/netbase_5.0.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine rename to 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 similarity index 100% rename from meta-yocto/recipes-core/uclibc/uclibc_git.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-graphics/mesa/mesa-dri_git.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf rename to 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 similarity index 100% rename from meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf rename to 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 similarity index 100% rename from meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend rename to 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 similarity index 100% rename from meta-yocto/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend rename to 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 edbccf02ce..98bfd70c22 100644 --- a/meta-yocto/conf/bblayers.conf.sample +++ b/meta-yocto/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "5" +LCONF_VERSION = "6" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -8,4 +8,5 @@ BBFILES ?= "" BBLAYERS ?= " \ ##COREBASE##/meta \ ##COREBASE##/meta-yocto \ + ##COREBASE##/meta-yocto-bsp \ " diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index 5409a7761f..6897ac481a 100644 --- a/meta-yocto/conf/distro/poky.conf +++ b/meta-yocto/conf/distro/poky.conf @@ -9,6 +9,7 @@ MAINTAINER = "Poky " TARGET_VENDOR = "-poky" LOCALCONF_VERSION = "1" +LAYER_CONF_VERSION ?= "6" DISTRO_FEATURES_append = " largefile opengl"