sane-srcrevs: bump SHR's phone* applications to current

[openembedded.git] / conf / enterprise.conf

diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index f839340..035abe6 100644 (file)
--- 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', '(gst-plugins-ugly|mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|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)}"