aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-sato
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2015-07-20 22:11:29 -0400
committerDrew Moseley <drew_moseley@mentor.com>2015-07-20 22:11:29 -0400
commitc6fc93e50583c6167f8a3094cefd3309b4ac9c1f (patch)
tree5347a4e177479ccb0190f8c43db6aef32c579fc5 /common/recipes-sato
parent3b7a2713de1de10d3e3ca0f9a4a7ac909993fffa (diff)
parent1d23d65ddf9396b022726775a56ef5d0b015d93c (diff)
downloadmeta-amd-c6fc93e50583c6167f8a3094cefd3309b4ac9c1f.tar.gz
meta-amd-c6fc93e50583c6167f8a3094cefd3309b4ac9c1f.tar.bz2
meta-amd-c6fc93e50583c6167f8a3094cefd3309b4ac9c1f.zip
Merge branch 'dizzy' into foo
Conflicts: common/recipes-benchmark/iperf/iperf_2.0.5.bbappend common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend common/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend common/recipes-multimedia/mplayer/mplayer2_git.bbappend meta-baldeagle/conf/machine/baldeagle.conf meta-steppeeagle/conf/machine/steppeeagle.conf
Diffstat (limited to 'common/recipes-sato')
-rw-r--r--common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend b/common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
index 89249f53..20e2352c 100644
--- a/common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
+++ b/common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
@@ -1 +1 @@
-RDEPENDS_${PN}-apps_remove := "${@bb.utils.contains("DISTRO", "mel", "", "gaku", d)}"
+RDEPENDS_${PN}-apps_remove_amd := "${@bb.utils.contains("DISTRO", "mel", "", "gaku", d)}"