diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 35 |
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" # Other -export PKG_CONFIG_DIR = "${STAGING_DATADIR}/pkgconfig" -export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" +export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" @@ -453,3 +453,34 @@ IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" # Magic Cookie for SANITY CHECK ################################################################## OES_BITBAKE_CONF = "1" + +################################################################## +# Task-base stuff +################################################################## + +MACHINE_FEATURES ?= "kernel26" +DISTRO_FEATURES ?= "" + +# This is used to limit what packages goes into images built, so set big by default +ROOT_FLASH_SIZE ?= "256" + +GUI_MACHINE_CLASS ?= "smallscreen" + +DISTRO_EXTRA_RDEPENDS ?= "" +DISTRO_EXTRA_RRECOMMENDS ?= "" +MACHINE_EXTRA_RDEPENDS ?= "" +MACHINE_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +COMBINED_FEATURES = "\ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" + |