diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-03 16:22:16 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-03 16:22:16 +0100 |
| commit | c0fcc31726c8c0ae90657512bd95bc983d1a8e4b (patch) | |
| tree | 3b59e0fae49e720712c76424056eb568f002be51 /conf | |
| parent | edbb2e054166f3414e8a604a2b4f2ef8d775c02a (diff) | |
| parent | 0d2c29eaff64c853bdd73b9cbf01fbe39020db46 (diff) | |
| download | openembedded-c0fcc31726c8c0ae90657512bd95bc983d1a8e4b.tar.gz | |
Merge branch 'holger/enterprise' into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | conf/enterprise.conf | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index edb4e4ddbc..4273152a87 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -547,6 +547,9 @@ export STAGING_IDLDIR = "${STAGING_DATADIR}/idl" # library package naming AUTO_LIBNAME_PKGS = "${PACKAGES}" +# Globally toggle certain dependencies +ENTERPRISE_DISTRO ?= "0" + ### ### Config file processing ### @@ -580,6 +583,7 @@ include conf/distro/${DISTRO}.conf include conf/documentation.conf require conf/sanity.conf require conf/abi_version.conf +require conf/enterprise.conf ################################################################## # Weak variables (usually to retain backwards compatibility) diff --git a/conf/enterprise.conf b/conf/enterprise.conf new file mode 100644 index 0000000000..79637661dd --- /dev/null +++ b/conf/enterprise.conf @@ -0,0 +1,2 @@ +# For the enterprise edition we want to avoid certain packages by default. +BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(gst-plugins-ugly|mp3blaster|mpg123|mpg321|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|python-mad|opie-mediaplayer1-libmadplugin)', '', d)}" |