diff options
| author | Phil Blundell <philb@gnu.org> | 2008-10-27 20:43:03 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2008-10-27 20:43:03 +0000 |
| commit | 859ecccee890787b33bda996de76589b509178a3 (patch) | |
| tree | 706a2257231b4e1c3666c5e813c9cdfc1de5c091 | |
| parent | b8fd11a4bf335be15e056e2fa91e8022457696e3 (diff) | |
| parent | ad6eb13bb445039aa6e57f3c266c2ebc7c78c470 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | classes/sanity.bbclass | 10 | ||||
| -rw-r--r-- | conf/machine/omap5912osk.conf | 1 | ||||
| -rw-r--r-- | packages/gstreamer/gst-plugins-base_0.10.17.bb | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index c9effb5596..027d948fce 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -172,6 +172,16 @@ def check_sanity(e): f.write(distro_pr) f.close() + + # + # Check there aren't duplicates in PACKAGE_ARCHS + # + archs = data.getVar('PACKAGE_ARCHS', e.data, True).split() + for arch in archs: + if archs.count(arch) != 1: + messages = messages + "Error, Your PACKAGE_ARCHS field contains duplicates. Perhaps you set EXTRA_PACKAGE_ARCHS twice accidently through some tune file?\n" + break + if messages != "": raise_sanity_error(messages) diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 5c7f5bed7f..d8caf938bd 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the OMAP Starter Kit with a 5912 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" diff --git a/packages/gstreamer/gst-plugins-base_0.10.17.bb b/packages/gstreamer/gst-plugins-base_0.10.17.bb index 56c9bfab04..d2fd547a26 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.17.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.17.bb @@ -6,7 +6,7 @@ PROVIDES += "gst-plugins" # if alsa has been built and is present. You will # not get an error if this is not present, just # a missing alsa plugin -DEPENDS += "alsa-lib libsm" +DEPENDS += "alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv" -PR = "r3" +PR = "r4" |