[oe-commits] org.oe.dev merge of '5e082795f9bdcb7a895ebe0387566db073a6b4f6'

[slapin commit]

merge of '5e082795f9bdcb7a895ebe0387566db073a6b4f6'
     and 'c0b27fb20d3acf8fd54af737b63355f45246e05a'

Author: slapin at openembedded.org
Branch: org.openembedded.dev
Revision: 9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be
Files:
1
conf/bitbake.conf
packages/efl1/ecore-native_0.9.9.038.bb
conf/machine/palmld.conf
Diffs:

#
# mt diff -r5e082795f9bdcb7a895ebe0387566db073a6b4f6 -r9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be
#
# 
# 
# patch "conf/bitbake.conf"
#  from [28be7aa3c03959211fa8fff38d1903e1ec2dd8de]
#    to [1a40a8a4b4660be43379de36b41dceabe1bebd19]
# 
# patch "packages/efl1/ecore-native_0.9.9.038.bb"
#  from [a6c082e1855fe38962b17d575b31619fd89ddc28]
#    to [17a8335856faa8d9c108f59dd7ce54f1db34ec00]
# 
============================================================
--- conf/bitbake.conf	28be7aa3c03959211fa8fff38d1903e1ec2dd8de
+++ conf/bitbake.conf	1a40a8a4b4660be43379de36b41dceabe1bebd19
@@ -468,7 +468,7 @@ OES_BITBAKE_CONF = "1"
 OES_BITBAKE_CONF = "1"
 
 ##################################################################
-# Task-base stuff
+# Machine properties and task-base stuff
 ##################################################################
 
 MACHINE_FEATURES ?= "kernel26"
@@ -477,7 +477,13 @@ ROOT_FLASH_SIZE ?= "256"
 # This is used to limit what packages goes into images built, so set big by default
 ROOT_FLASH_SIZE ?= "256"
 
-GUI_MACHINE_CLASS ?= "smallscreen"
+MACHINE_GUI_CLASS ?= "smallscreen"
+# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead
+GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}"
+MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
+MACHINE_DISPLAY_ORIENTATION ?= "0"
+MACHINE_DISPLAY_BPP ?= "16"
 
 DISTRO_EXTRA_RDEPENDS ?= ""
 DISTRO_EXTRA_RRECOMMENDS ?= ""
============================================================
--- packages/efl1/ecore-native_0.9.9.038.bb	a6c082e1855fe38962b17d575b31619fd89ddc28
+++ packages/efl1/ecore-native_0.9.9.038.bb	17a8335856faa8d9c108f59dd7ce54f1db34ec00
@@ -1,11 +1,12 @@ DEPENDS = "eet-native evas-native"
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
+PR = "r1"
 
 EXTRA_OECONF = "\
                 --enable-ecore-txt \
                 --disable-ecore-x-xcb \
-                --enable-ecore-x \
+                --disable-ecore-x \
                 --enable-ecore-job \
                 --enable-ecore-directfb \
                 --enable-ecore-fb \


#
# mt diff -rc0b27fb20d3acf8fd54af737b63355f45246e05a -r9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be
#
# 
# 
# patch "conf/machine/palmld.conf"
#  from [5733d4803a281832c68a5a1ff2eb4ead15b8fbba]
#    to [36ef525ef87ccfbc617c0404c26bd3a750a58c1b]
# 
============================================================
--- conf/machine/palmld.conf	5733d4803a281832c68a5a1ff2eb4ead15b8fbba
+++ conf/machine/palmld.conf	36ef525ef87ccfbc617c0404c26bd3a750a58c1b
@@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-pxapwm-bl \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
-	kernel-module-wm97xx-ts \		
 	"
 
 #