[oe-commits] Chris Larson : enterprise.conf: combine with user-specified BBMASK instead of overwriting it
GIT User account
git at amethyst.openembedded.net
Fri Mar 13 17:20:59 UTC 2009
Module: openembedded.git
Branch: xora/angstrom-sqeeezy
Commit: 5ee794ae6cfb4a831f81d5e4ca56793fa07a1b79
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5ee794ae6cfb4a831f81d5e4ca56793fa07a1b79
Author: Chris Larson <clarson at kergoth.com>
Date: Fri Mar 13 12:36:41 2009 -0400
enterprise.conf: combine with user-specified BBMASK instead of overwriting it
---
conf/enterprise.conf | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index a1e0d70..035abe6 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)}"
More information about the Openembedded-commits
mailing list