summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/conf/bblayers.conf.sample5
-rw-r--r--build/conf/local.conf.sample10
-rw-r--r--meta-moblin/conf/layer.conf9
-rw-r--r--meta/conf/layer.conf11
-rwxr-xr-xscripts/poky-env-internal8
5 files changed, 32 insertions, 11 deletions
diff --git a/build/conf/bblayers.conf.sample b/build/conf/bblayers.conf.sample
new file mode 100644
index 0000000000..3ea6eda66a
--- /dev/null
+++ b/build/conf/bblayers.conf.sample
@@ -0,0 +1,5 @@
1BBFILES ?= ""
2BBLAYERS = " \
3 ${OEROOT}/meta \
4 ${OEROOT}/meta-moblin \
5 "
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index e195b33b88..959a3b9a3e 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -2,16 +2,6 @@
2DL_DIR ?= "${OEROOT}/sources" 2DL_DIR ?= "${OEROOT}/sources"
3# Where to cache Poky's built staging output 3# Where to cache Poky's built staging output
4PSTAGE_DIR ?= "${OEROOT}/pstage" 4PSTAGE_DIR ?= "${OEROOT}/pstage"
5BBFILES += "\
6 ${OEROOT}/meta/packages/*/*.bb \
7 ${OEROOT}/meta-moblin/packages/*/*.bb"
8
9BBFILE_COLLECTIONS = "normal moblin"
10BBFILE_PATTERN_normal = "^${OEROOT}/meta/"
11BBFILE_PATTERN_moblin = "^${OEROOT}/meta-moblin/"
12
13BBFILE_PRIORITY_normal = "5"
14BBFILE_PRIORITY_moblin = "5"
15 5
16# Uncomment and set to allow bitbake to execute multiple tasks at once. 6# Uncomment and set to allow bitbake to execute multiple tasks at once.
17# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would 7# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
diff --git a/meta-moblin/conf/layer.conf b/meta-moblin/conf/layer.conf
new file mode 100644
index 0000000000..ce5b0ac5e8
--- /dev/null
+++ b/meta-moblin/conf/layer.conf
@@ -0,0 +1,9 @@
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}/packages/*/*.bb"
6
7BBFILE_COLLECTIONS += "moblin"
8BBFILE_PATTERN_moblin := "^${OEROOT}/meta-moblin/"
9BBFILE_PRIORITY_moblin = "5"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
new file mode 100644
index 0000000000..567964f1ef
--- /dev/null
+++ b/meta/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}/packages/*/*.bb"
6
7BBFILE_COLLECTIONS += "normal""
8BBFILE_PATTERN_normal := "^${LAYERDIR}/meta/"
9BBFILE_PRIORITY_normal = "5"
10
11
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 4bfcf63c59..b931e29323 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -93,11 +93,17 @@ fi
93if [ "x" = "x$POKYLOCALCONF" ]; then 93if [ "x" = "x$POKYLOCALCONF" ]; then
94 POKYLOCALCONF="$BUILDDIR/conf/local.conf.sample" 94 POKYLOCALCONF="$BUILDDIR/conf/local.conf.sample"
95fi 95fi
96
97if ! (test -r "$BUILDDIR/conf/local.conf"); then 96if ! (test -r "$BUILDDIR/conf/local.conf"); then
98 cp -f $POKYLOCALCONF $BUILDDIR/conf/local.conf 97 cp -f $POKYLOCALCONF $BUILDDIR/conf/local.conf
99fi 98fi
100 99
100if [ "x" = "x$POKYLAYERCONF" ]; then
101 POKYLAYERCONF="$BUILDDIR/conf/bblayers.conf.sample"
102fi
103if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
104 cp -f $POKYLAYERCONF $BUILDDIR/conf/bblayers.conf
105fi
106
101export BBPATH OEROOT BUILD_SYS BUILDDIR 107export BBPATH OEROOT BUILD_SYS BUILDDIR
102 108
103# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make 109# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make