[oe-commits] Holger Hans Peter Freyther : enterprise: Blacklist ffmpeg and mplayer too
GIT User account
git at amethyst.openembedded.net
Sun Nov 16 00:15:52 UTC 2008
Module: openembedded.git
Branch: org.openembedded.dev
Commit: e3005f0e895adac9dfaecb5233e1afbeb450be0d
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e3005f0e895adac9dfaecb5233e1afbeb450be0d
Author: Holger Hans Peter Freyther <zecke at openmoko.org>
Date: Wed Nov 12 14:33:14 2008 +0100
enterprise: Blacklist ffmpeg and mplayer too
ffmpeg contains mp2/mp3 audio decoding routines, We can not
distribute that.
---
conf/enterprise.conf | 2 +-
packages/tasks/task-openmoko-feed.bb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index 5f89cb1..f839340 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 9781d7b..ac66a27 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 \
More information about the Openembedded-commits
mailing list