aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2009-03-13 12:36:41 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-13 12:36:41 -0400
commit5ee794ae6cfb4a831f81d5e4ca56793fa07a1b79 (patch)
tree1d0528660e86db5270f1902f0d0d0ba1c703e4b2
parent8633d77524ab84aee932b5fef6c2823a8409c7c5 (diff)
downloadopenembedded-5ee794ae6cfb4a831f81d5e4ca56793fa07a1b79.tar.gz
openembedded-5ee794ae6cfb4a831f81d5e4ca56793fa07a1b79.tar.bz2
openembedded-5ee794ae6cfb4a831f81d5e4ca56793fa07a1b79.zip
enterprise.conf: combine with user-specified BBMASK instead of overwriting it
-rw-r--r--conf/enterprise.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index a1e0d70691..035abe611b 100644
--- a/conf/enterprise.conf
+++ b/conf/enterprise.conf
@@ -1,2 +1,4 @@
# For the enterprise edition we want to avoid certain packages by default.
-BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|python-mad|opie-mediaplayer1-libmadplugin|ffmpeg|mplayer)', '', d)}"
+BBMASK ?= ""
+OLDBBMASK := "${BBMASK}"
+BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', base_conditional('OLDBBMASK', '', '', '(${OLDBBMASK})|', d) + '(mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|python-mad|opie-mediaplayer1-libmadplugin|ffmpeg|mplayer)', '${OLDBBMASK}', d)}"