summaryrefslogtreecommitdiff
path: root/recipes-support
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-01-22 16:11:45 +0100
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-01-22 16:11:45 +0100
commit97c9751262dd63ac9b9838c80a64da7c6cdd5b21 (patch)
treee450ca1bde7a2788b01188e1751d08df630dc916 /recipes-support
parent4a943a3ec4fdfcb8907cddd1b816ff8e2fac6967 (diff)
downloadmeta-yogurt-97c9751262dd63ac9b9838c80a64da7c6cdd5b21.tar.bz2
meta-yogurt-97c9751262dd63ac9b9838c80a64da7c6cdd5b21.zip
fb-test: solve another conflict of this package
Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Diffstat (limited to 'recipes-support')
-rw-r--r--recipes-support/fbtest/fb-test_%.bbappend4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-support/fbtest/fb-test_%.bbappend b/recipes-support/fbtest/fb-test_%.bbappend
index 12d532f..3204b55 100644
--- a/recipes-support/fbtest/fb-test_%.bbappend
+++ b/recipes-support/fbtest/fb-test_%.bbappend
@@ -1,9 +1,11 @@
do_install() {
install -d ${D}${bindir}
- for prog in rect fb-test offset ; do
+ for prog in rect fb-test ; do
install -m 0755 $prog ${D}${bindir}
done
#conflicts with perf
install -m 0755 perf ${D}${bindir}/fbtest-perf
+ #conflicts with mesa-demos
+ install -m 0755 offset ${D}${bindir}/fbtest-offset
}