aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@openmoko.org>2008-11-12 14:33:14 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-11-15 18:27:13 +0100
commite3005f0e895adac9dfaecb5233e1afbeb450be0d (patch)
tree517f25c653220571892c682ab94375853f6cacef
parent3a7cbb9ed94881b119fefb9f85f52840debd5914 (diff)
downloadopenembedded-e3005f0e895adac9dfaecb5233e1afbeb450be0d.tar.gz
enterprise: Blacklist ffmpeg and mplayer too
ffmpeg contains mp2/mp3 audio decoding routines, We can not distribute that.
-rw-r--r--conf/enterprise.conf2
-rw-r--r--packages/tasks/task-openmoko-feed.bb4
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index 5f89cb1c5e..f839340ebc 100644
--- a/conf/enterprise.conf
+++ b/conf/enterprise.conf
@@ -1,2 +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|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|python-mad|opie-mediaplayer1-libmadplugin)', '', d)}"
+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)}"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 9781d7beaf..ac66a27cdc 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Openmoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r47"
+PR = "r48"
inherit task
@@ -22,7 +22,7 @@ RDEPENDS_task-openmoko-feed = "\
kbdd \
kexec-tools \
midori \
- mplayer \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'mplayer', d)} \
mtpaint \
mysql \
nano \