[oe-commits] org.oe.dev merge of '42e4a37b3bc1bce6b8ffb4ca48e06f8b74e5797a'

[rwhitby commit]

merge of '42e4a37b3bc1bce6b8ffb4ca48e06f8b74e5797a'
     and 'd583b83b9659b4a2ce57f16c9a02e0d6ddcb01c8'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0fd461d5e625d032704c778f13e5a3748bae0ae4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0fd461d5e625d032704c778f13e5a3748bae0ae4
Files:
1
packages/gsm/files/default
classes/image.bbclass
packages/mplayer/mplayer_svn.bb
packages/tasks/task-openmoko.bb
Diffs:

#
# mt diff -r42e4a37b3bc1bce6b8ffb4ca48e06f8b74e5797a -r0fd461d5e625d032704c778f13e5a3748bae0ae4
#
# 
# no changes
# 


#
# mt diff -rd583b83b9659b4a2ce57f16c9a02e0d6ddcb01c8 -r0fd461d5e625d032704c778f13e5a3748bae0ae4
#
# 
# 
# add_file "packages/gsm/files/default"
#  content [7ce0e5ef1d869657220f2726615b4248e22cf672]
# 
# patch "classes/image.bbclass"
#  from [a8711c6252c211699a73f6b7017177bfdc03ca54]
#    to [2111e717ff5b9fe3a27b6376bb3bb2a494241fa2]
# 
# patch "packages/mplayer/mplayer_svn.bb"
#  from [1c3891f07656f0a24d93af074fcedd40d4aee446]
#    to [5f640de05cc9ddccb4819eb7c4867addc5b1e78a]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [7ccc795bf3d89e590046cd65532bb1d96095822d]
#    to [8c135ac821c0257e6ce9eaa53c6da98b56f198a0]
# 
============================================================
--- packages/gsm/files/default	7ce0e5ef1d869657220f2726615b4248e22cf672
+++ packages/gsm/files/default	7ce0e5ef1d869657220f2726615b4248e22cf672
@@ -0,0 +1,9 @@
+# gsmd	This shell script configures for the gsmd init script.
+
+# If you must specify special options, uncomment and modify the next line
+#GSMD_OPTS="-s 115200 -F"
+
+# If your GSM device needs to be powered up, uncomment and modify the next line
+#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+
+#GSM_DEV="/dev/ttyS1"
============================================================
--- classes/image.bbclass	a8711c6252c211699a73f6b7017177bfdc03ca54
+++ classes/image.bbclass	2111e717ff5b9fe3a27b6376bb3bb2a494241fa2
@@ -93,7 +93,7 @@ fakeroot do_rootfs () {
 		fi
 
 		cd ${DEPLOY_DIR_IMAGE}/
-		rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*
+		rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
 		ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
 	done
 
============================================================
--- packages/mplayer/mplayer_svn.bb	1c3891f07656f0a24d93af074fcedd40d4aee446
+++ packages/mplayer/mplayer_svn.bb	5f640de05cc9ddccb4819eb7c4867addc5b1e78a
@@ -167,14 +167,25 @@ EXTRA_OECONF = " \
         --disable-runtime-cpudetection \
         "
 
+EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
+
+#enable support for the ati imageon series (w100 and w3220)
 EXTRA_OECONF_append_c7x0 = " --enable-w100 "
 EXTRA_OECONF_append_hx4700 = " --enable-imageon "
-EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
+
+#enable pxa270 overlay support
 EXTRA_OECONF_append_spitz = " --enable-pxa "
+EXTRA_OECONF_append_a780 = " --enable-pxa "
 
+#build with support for the iwmmxt instruction support (pxa270 and up) 
 TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt"
 PACKAGE_ARCH_spitz = "iwmmxt"
+TARGET_CC_ARCH_a780 = "-march=iwmmxt -mtune=iwmmxt"
+PACKAGE_ARCH_a780 = "iwmmxt"
+TARGET_CC_ARCH_hx4700 = "-march=iwmmxt -mtune=iwmmxt"
+PACKAGE_ARCH_hx4700= "iwmmxt"
 
+
 do_configure() {
 	cp ${WORKDIR}/vo_w100.c ${S}/libvo
 	cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
============================================================
--- packages/tasks/task-openmoko.bb	7ccc795bf3d89e590046cd65532bb1d96095822d
+++ packages/tasks/task-openmoko.bb	8c135ac821c0257e6ce9eaa53c6da98b56f198a0
@@ -5,7 +5,7 @@ PROVIDES = "task-openmoko-everything"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 
-PR = "r30"
+PR = "r31"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -29,21 +29,9 @@ RDEPENDS_task-openmoko-linux = "\
 DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
 RDEPENDS_task-openmoko-linux = "\
   task-base \
-  base-files \
-  base-passwd \
-  busybox \
-  dropbear \
-  fuser \
-  initscripts \
-  netbase \
   sysfsutils \
-  setserial \
-  sysvinit \
-  sysvinit-pidof \
-  tinylogin \
   modutils-initscripts \
   module-init-tools-depmod \
-  udev \
   rsync \
 #  update-alternatives \
 "
@@ -167,6 +155,9 @@ RDEPENDS_task-openmoko-demo = "\
   openmoko-panel-demo-simple \
   openmoko-panel-gsm \
   openmoko-panel-mainmenu \
+  openmoko-rssreader \
+  openmoko-messages \
+  openmoko-today \
   xcursor-transparent-theme \
   web \
   rxvt-unicode \