[oe-commits] org.oe.dev merge of '090d29830a5f223586361b1541b1a3b28b8e4997'

[oe commit]

merge of '090d29830a5f223586361b1541b1a3b28b8e4997'
     and 'bd52cfc69a4e0959191eccd3b5f851c64dc9e0d0'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 51c8bec079d3bd6ef15c2674a76e2fd007e47122
ViewMTN: http://monotone.openembedded.org/revision/info/51c8bec079d3bd6ef15c2674a76e2fd007e47122
Files:
1
packages/failme.bb
packages/dsplink/dsplink_1.50.bb
Diffs:

#
# mt diff -r090d29830a5f223586361b1541b1a3b28b8e4997 -r51c8bec079d3bd6ef15c2674a76e2fd007e47122
#
#
#
# add_file "packages/failme.bb"
#  content [0bd9c7a7c436d385836892a97f194dd00a2f30e5]
#
============================================================
--- packages/failme.bb	0bd9c7a7c436d385836892a97f194dd00a2f30e5
+++ packages/failme.bb	0bd9c7a7c436d385836892a97f194dd00a2f30e5
@@ -0,0 +1,5 @@
+
+do_configure() {
+idontexist
+}
+


#
# mt diff -rbd52cfc69a4e0959191eccd3b5f851c64dc9e0d0 -r51c8bec079d3bd6ef15c2674a76e2fd007e47122
#
#
#
# patch "packages/dsplink/dsplink_1.50.bb"
#  from [ba3fbbc36f80f856194516e3676c4be8ff95593f]
#    to [cea3f0783310d4a2a32b0c7f38aa90c15cbb2ff4]
#
============================================================
--- packages/dsplink/dsplink_1.50.bb	ba3fbbc36f80f856194516e3676c4be8ff95593f
+++ packages/dsplink/dsplink_1.50.bb	cea3f0783310d4a2a32b0c7f38aa90c15cbb2ff4
@@ -47,6 +47,7 @@ do_compile () {
 do_compile () {
 	ln -sf ${S}/gpp/src/api/*h ${S}/gpp/inc/
 	ln -sf ${S}/gpp/src/pmgr/Linux/2.6.18 ${S}/gpp/src/pmgr/Linux/2.6.26-rc2-omap1
+	unset DISPLAY
 	oe_runmake -C ${S}/gpp/src
 }