summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-06-29 07:44:00 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-06-29 07:44:00 +0000
commit5b14520d3f8ee8a1cff3418777b5c97dc2fa8227 (patch)
treef0d2674d9e1b9fc7e171084e844be77df2e78f1c
parent025ff894a018e6cebbf8666eaec02de6866311de (diff)
downloadpoky-5b14520d3f8ee8a1cff3418777b5c97dc2fa8227.tar.gz
bitbake.conf: task-base stuff
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2056 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/bitbake.conf35
1 files changed, 33 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f75e7c59de..0389c578b0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -397,8 +397,8 @@ SLOT = "0"
397 397
398# Other 398# Other
399 399
400export PKG_CONFIG_DIR = "${STAGING_DATADIR}/pkgconfig" 400export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig"
401export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" 401export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
402export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" 402export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
403 403
404export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" 404export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake"
@@ -453,3 +453,34 @@ IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
453# Magic Cookie for SANITY CHECK 453# Magic Cookie for SANITY CHECK
454################################################################## 454##################################################################
455OES_BITBAKE_CONF = "1" 455OES_BITBAKE_CONF = "1"
456
457##################################################################
458# Task-base stuff
459##################################################################
460
461MACHINE_FEATURES ?= "kernel26"
462DISTRO_FEATURES ?= ""
463
464# This is used to limit what packages goes into images built, so set big by default
465ROOT_FLASH_SIZE ?= "256"
466
467GUI_MACHINE_CLASS ?= "smallscreen"
468
469DISTRO_EXTRA_RDEPENDS ?= ""
470DISTRO_EXTRA_RRECOMMENDS ?= ""
471MACHINE_EXTRA_RDEPENDS ?= ""
472MACHINE_EXTRA_RRECOMMENDS ?= ""
473MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
474MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
475
476COMBINED_FEATURES = "\
477 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
478 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
479 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
480 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
481 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
482 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \
483 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
484 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \
485 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
486