[oe-commits] org.oe.dev merge of '4989371c8e7cec943a964b459ec3e71c0f547204'

Laibsch commit openembedded-commits at lists.openembedded.org
Sat Jan 12 14:42:04 UTC 2008 

merge of '4989371c8e7cec943a964b459ec3e71c0f547204'
     and 'a541f884d07223a5c7e560a0e5732d213098f838'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 3f5863be74aaf18d9f78fd1e075d3203cc282bdc
ViewMTN: http://monotone.openembedded.org/revision/info/3f5863be74aaf18d9f78fd1e075d3203cc282bdc
Files:
1
packages/supertux/supertux_0.1.2.bb
packages/tea/tea_17.3.5.bb
conf/machine/include/tune-strongarm.inc
conf/machine/include/tune-strongarm1100.inc
conf/machine/collie.conf
conf/machine/h3600.conf
conf/machine/htcwallaby.conf
conf/machine/jornada56x.conf
conf/machine/jornada7xx.conf
conf/machine/shark.conf
conf/machine/simpad.conf
Diffs:

#
# mt diff -r4989371c8e7cec943a964b459ec3e71c0f547204 -r3f5863be74aaf18d9f78fd1e075d3203cc282bdc
#
# 
# 
# patch "packages/supertux/supertux_0.1.2.bb"
#  from [710259857ec8d40cec2249206236924a3d8eb42c]
#    to [09cdf957a3989df2fcb1656badfab95e1da5adb2]
# 
# patch "packages/tea/tea_17.3.5.bb"
#  from [659e70bcc2fcc43692a31aca58af3daa0607db53]
#    to [2c12d2003ebdd187f9684fc6d6395660ab825f46]
# 
============================================================
--- packages/supertux/supertux_0.1.2.bb	710259857ec8d40cec2249206236924a3d8eb42c
+++ packages/supertux/supertux_0.1.2.bb	09cdf957a3989df2fcb1656badfab95e1da5adb2
@@ -1,15 +1,16 @@ LICENSE = "GPL"
 DESCRIPTION = "SuperTux is a classic 2D jump'n'run sidescroller game \
 in a style similar to the original SuperMario games."
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
            http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1 \
 	   file://supertux.png"
 
 export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+EXTRA_OECONF = "--disable-opengl"
 
 inherit autotools sdl
 
============================================================
--- packages/tea/tea_17.3.5.bb	659e70bcc2fcc43692a31aca58af3daa0607db53
+++ packages/tea/tea_17.3.5.bb	2c12d2003ebdd187f9684fc6d6395660ab825f46
@@ -1,7 +1,8 @@
-DESCRIPTION = "Tea - a GTK based text editor tith highlighting and a lot of processing features"
+DESCRIPTION = "Tea - a GTK based text editor with highlighting and a lot of processing features"
 SECTION = "gpe"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gtksourceview"
+PR = "r1"
 
 inherit autotools
 


#
# mt diff -ra541f884d07223a5c7e560a0e5732d213098f838 -r3f5863be74aaf18d9f78fd1e075d3203cc282bdc
#
# 
# 
# rename "conf/machine/include/tune-strongarm.inc"
#     to "conf/machine/include/tune-strongarm1100.inc"
# 
# patch "conf/machine/collie.conf"
#  from [8ec2568fe9cb9c9b5580adf5e26eb873400e040c]
#    to [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
# 
# patch "conf/machine/h3600.conf"
#  from [baccbbb3fd46dea023ff7dc49ac173b169688428]
#    to [946b47e617dd5bb30df3ee547902b05861e89f5b]
# 
# patch "conf/machine/htcwallaby.conf"
#  from [f536aa7626c709ec12492ce50cec7af6c4062a8c]
#    to [d6588b12e47e4671574a6a9f611ca56ed3e54a66]
# 
# patch "conf/machine/include/tune-strongarm1100.inc"
#  from [4bb1dc721e55061bb98b49bae4f57bd4ff088f02]
#    to [6b646008e17bfa06b0b28e48fd811701e7f4ea78]
# 
# patch "conf/machine/jornada56x.conf"
#  from [feef2730324948026b5302d47b01bae79fa6bc39]
#    to [6e67e41a8cb53163822499066dcf76e2ed17c3eb]
# 
# patch "conf/machine/jornada7xx.conf"
#  from [931f12408f78e84eaafc92103fd2590493bcd246]
#    to [b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac]
# 
# patch "conf/machine/shark.conf"
#  from [8a744b9daf9db02c05297d317225e9f6d6cb012e]
#    to [45f471879704cfba13dd30daae06942e7bdd6716]
# 
# patch "conf/machine/simpad.conf"
#  from [9987d298771d159fd85308e85bdb5a82fd16832d]
#    to [b9316853a8b1c9a28a1c4df96b4166a416335cc3]
# 
============================================================
--- conf/machine/collie.conf	8ec2568fe9cb9c9b5580adf5e26eb873400e040c
+++ conf/machine/collie.conf	a0553e914a9461a2f8f27c4cf8972dcebb056d0d
@@ -1,8 +1,9 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
@@ -13,13 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 -
 MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
 IMAGE_LINGUAS = ""
-
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-require conf/machine/include/tune-strongarm.inc
-
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
============================================================
--- conf/machine/h3600.conf	baccbbb3fd46dea023ff7dc49ac173b169688428
+++ conf/machine/h3600.conf	946b47e617dd5bb30df3ee547902b05861e89f5b
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 "
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 # h3700, h3800 have 32, but let that be the bonus
 ROOT_FLASH_SIZE = "16"
============================================================
--- conf/machine/htcwallaby.conf	f536aa7626c709ec12492ce50cec7af6c4062a8c
+++ conf/machine/htcwallaby.conf	d6588b12e47e4671574a6a9f611ca56ed3e54a66
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 "
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 ROOT_FLASH_SIZE = "16" 
 VOLATILE_STORAGE_SIZE = "32"
============================================================
--- conf/machine/include/tune-strongarm.inc	4bb1dc721e55061bb98b49bae4f57bd4ff088f02
+++ conf/machine/include/tune-strongarm1100.inc	6b646008e17bfa06b0b28e48fd811701e7f4ea78
@@ -1,2 +1,5 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
+# This machine lists common configuration options for Strongarm 1100 devices
+# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
 
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100"
+
============================================================
--- conf/machine/jornada56x.conf	feef2730324948026b5302d47b01bae79fa6bc39
+++ conf/machine/jornada56x.conf	6e67e41a8cb53163822499066dcf76e2ed17c3eb
@@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttySA0"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
+require conf/machine/include/tune-strongarm1100.inc
-require conf/machine/include/tune-strongarm.inc
============================================================
--- conf/machine/jornada7xx.conf	931f12408f78e84eaafc92103fd2590493bcd246
+++ conf/machine/jornada7xx.conf	b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac
@@ -1,10 +1,10 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: HP Jornada 7xx 
 #@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
 
 TARGET_ARCH = "arm"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
============================================================
--- conf/machine/shark.conf	8a744b9daf9db02c05297d317225e9f6d6cb012e
+++ conf/machine/shark.conf	45f471879704cfba13dd30daae06942e7bdd6716
@@ -15,7 +15,7 @@ USE_VT = "0"
 ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
============================================================
--- conf/machine/simpad.conf	9987d298771d159fd85308e85bdb5a82fd16832d
+++ conf/machine/simpad.conf	b9316853a8b1c9a28a1c4df96b4166a416335cc3
@@ -9,7 +9,7 @@ include conf/machine/include/simpad-${MA
 MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
 
 include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 
 ROOT_FLASH_SIZE = "16"

More information about the Openembedded-commits mailing list