diff options
| -rw-r--r-- | meta-extras/conf/distro/include/poky-extras-src-revisions.inc | 6 | ||||
| -rw-r--r-- | meta-extras/conf/layer.conf | 11 | ||||
| -rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 7 | ||||
| -rw-r--r-- | meta/conf/layer.conf | 2 |
4 files changed, 18 insertions, 8 deletions
diff --git a/meta-extras/conf/distro/include/poky-extras-src-revisions.inc b/meta-extras/conf/distro/include/poky-extras-src-revisions.inc new file mode 100644 index 0000000000..0265ca9e6b --- /dev/null +++ b/meta-extras/conf/distro/include/poky-extras-src-revisions.inc @@ -0,0 +1,6 @@ +SRCREV_pn-evince ?= "2437" +SRCDATE_maemo-mapper-nohildon ?= "20061114" +SRCREV_pn-libxosd ?= "627" +SRCREV_pn-matchbox-applet-light ?= "1548" +SRCREV_pn-matchbox-common ?= "1561" + diff --git a/meta-extras/conf/layer.conf b/meta-extras/conf/layer.conf new file mode 100644 index 0000000000..1ba520a5a4 --- /dev/null +++ b/meta-extras/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}/packages/*/*.bb" + +BBFILE_COLLECTIONS += "extras" +BBFILE_PATTERN_extras := "^${LAYERDIR}/" +BBFILE_PRIORITY_extras = "5" + +require conf/distro/include/poky-extras-src-revisions.inc diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index d7e5fd5deb..7646996edd 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -40,13 +40,6 @@ SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-usbpath-native = "3172" SRCREV_pn-usbpath = "3172" -#meta-extras -SRCREV_pn-evince ?= "2437" -SRCDATE_maemo-mapper-nohildon ?= "20061114" -SRCREV_pn-libxosd ?= "627" -SRCREV_pn-matchbox-applet-light ?= "1548" -SRCREV_pn-matchbox-common ?= "1561" - # Preferred Versions: # PREFERRED_VERSION_libmatchbox ?= "1.9" diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 8ba991774c..7b3d539245 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -5,7 +5,7 @@ BBPATH := "${BBPATH}${LAYERDIR}" BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb" BBFILE_COLLECTIONS += "normal" -BBFILE_PATTERN_normal := "^${LAYERDIR}/meta/" +BBFILE_PATTERN_normal := "^${LAYERDIR}/" BBFILE_PRIORITY_normal = "5" require conf/distro/include/poky-default-revisions.inc |