[oe-commits] org.oe.dev merge of '77bddad5a15eedb425a97612fb10888da47c7b19'

woglinde2 commit oe at amethyst.openembedded.net
Sat May 17 19:33:48 UTC 2008 

merge of '77bddad5a15eedb425a97612fb10888da47c7b19'
     and 'e9694e67eab5656acc0305097c9945a509173ce7'

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: ed0aa1600b77c27c385bdb61f6e9728aa499015b
ViewMTN: http://monotone.openembedded.org/revision/info/ed0aa1600b77c27c385bdb61f6e9728aa499015b
Files:
1
conf/machine/include/tune-mips2.inc
conf/machine/rb500.conf
conf/machine/wl500g.conf
conf/machine/wrt54.conf
contrib/distro-packages/debian/openembedded-essential-1.4/debian/control
contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/tasks/task-opie-16mb.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-opie.bb
packages/uclibc/uclibc_0.9.29.bb
Diffs:

#
# mt diff -r77bddad5a15eedb425a97612fb10888da47c7b19 -red0aa1600b77c27c385bdb61f6e9728aa499015b
#
#
#
# add_file "conf/machine/include/tune-mips2.inc"
#  content [057bacb0584328df3d50b30000597eb1d919767b]
# 
# patch "conf/machine/rb500.conf"
#  from [c5e4304761ab59c29e7a9549abec25df0455a552]
#    to [ec3468237873c1f6f3831eb19db443d2aba4a9e0]
# 
# patch "conf/machine/wl500g.conf"
#  from [d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9]
#    to [b7ee5dd752935d7f8924e84976cadbce6359227d]
# 
# patch "conf/machine/wrt54.conf"
#  from [5d9e6710b8fae51d475e91a5c2047e7be52b7649]
#    to [2fe22c13b02b4959e3cab0cc7ff5c98fb68bf489]
#
============================================================
--- conf/machine/include/tune-mips2.inc	057bacb0584328df3d50b30000597eb1d919767b
+++ conf/machine/include/tune-mips2.inc	057bacb0584328df3d50b30000597eb1d919767b
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mips2"
============================================================
--- conf/machine/rb500.conf	c5e4304761ab59c29e7a9549abec25df0455a552
+++ conf/machine/rb500.conf	ec3468237873c1f6f3831eb19db443d2aba4a9e0
@@ -3,5 +3,6 @@ TARGET_ARCH = "mipsel"
 #@DESCRIPTION: Machine configuration for the MIPS based Routerboard
 
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os -mips2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-rb500"
+
+include conf/machine/include/tune-mips2.inc
============================================================
--- conf/machine/wl500g.conf	d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9
+++ conf/machine/wl500g.conf	b7ee5dd752935d7f8924e84976cadbce6359227d
@@ -5,4 +5,4 @@ MACHINE_FEATURES = "kernel26 usbhost wif
 TARGET_ARCH = "mipsel"
 MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
 
+include conf/machine/include/mips2.inc
-TARGET_CC_ARCH = "-Os -mips2"
============================================================
--- conf/machine/wrt54.conf	5d9e6710b8fae51d475e91a5c2047e7be52b7649
+++ conf/machine/wrt54.conf	2fe22c13b02b4959e3cab0cc7ff5c98fb68bf489
@@ -3,7 +3,6 @@ TARGET_ARCH = "mipsel"
 #@DESCRIPTION: Machine configuration for the MIPS based WRT54G(S) devices
 
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os"
 
 SERIAL_CONSOLE = "tts/0"
 


#
# mt diff -re9694e67eab5656acc0305097c9945a509173ce7 -red0aa1600b77c27c385bdb61f6e9728aa499015b
#
#
#
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/control"
#  from [b527265a4a8d5e1b7c8b8ecf77d86a5bd0892b57]
#    to [0c3280f88a76ccf4454f600420c2394625422b57]
# 
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules"
#  from [fca0385b822b8dc03a597d316d04549edc9dd1be]
#    to [f2b5b27d488e832661562e98cc7249a22c9e29bb]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
#  from [a85580d79b52077d3a62b921dea5d7de0827ff0d]
#    to [964a8dabe7c00485c6abaca8fd364eb631810716]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [a05dfd66bdd95a25bffd9f9ea592f03165e7321e]
#    to [91d936879c9fac0d051b7c80b290a712b953d3e0]
# 
# patch "packages/tasks/task-opie-16mb.bb"
#  from [17a97e85093fb7c7aaba5ea5de08086d633dc185]
#    to [cf1f25614ad8da263d528b3f34d314213dd05281]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [247d329aa6a21cecb1f4f74f1a838072b8aa22d8]
#    to [e996923d71e129ec881e2b565c3689d4ce4c94c5]
# 
# patch "packages/tasks/task-opie.bb"
#  from [78fbe261fe8ace945600c95b91627808e02cef52]
#    to [ae01f0abcd042b147b21cd29141a481fd081fdb4]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [2768d9ecc595b84f45ce4e80e84cf53949a8b652]
#    to [3283df3bb2a36857cc4cb9bd5bd8e5e3c3ea5b35]
#
============================================================
--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/control	b527265a4a8d5e1b7c8b8ecf77d86a5bd0892b57
+++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/control	0c3280f88a76ccf4454f600420c2394625422b57
@@ -3,7 +3,7 @@ Build-Depends: debhelper (>= 5)
 Priority: optional
 Maintainer: Marcin Juszkiewicz <hrw at openembedded.org>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: openembedded-essential
 Architecture: all
============================================================
--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules	fca0385b822b8dc03a597d316d04549edc9dd1be
+++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules	f2b5b27d488e832661562e98cc7249a22c9e29bb
@@ -4,6 +4,7 @@ clean:
 binary-arch:
 
 clean:
+	dh_clean
 
 binary-indep:
 	dh_testdir
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig	a85580d79b52077d3a62b921dea5d7de0827ff0d
+++ packages/linux/linux-omap2-git/beagleboard/defconfig	964a8dabe7c00485c6abaca8fd364eb631810716
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.26-rc1-omap1
-# Fri May  9 20:17:52 2008
+# Linux kernel version: 2.6.26-rc2-omap1
+# Sat May 17 13:43:38 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -196,6 +196,7 @@ CONFIG_ARCH_OMAP3430=y
 #
 # OMAP Board Type
 #
+# CONFIG_MACH_OMAP_LDP is not set
 # CONFIG_MACH_OMAP_3430SDP is not set
 # CONFIG_MACH_OMAP3EVM is not set
 CONFIG_MACH_OMAP3_BEAGLE=y
@@ -232,10 +233,6 @@ CONFIG_ARM_THUMB=y
 # CONFIG_ARM_THUMBEE is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_LOCKDOWN_TO_64K_L2 is not set
-# CONFIG_CPU_LOCKDOWN_TO_128K_L2 is not set
-CONFIG_CPU_LOCKDOWN_TO_256K_L2=y
-# CONFIG_CPU_L2CACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_HAS_TLS_REG=y
 # CONFIG_OUTER_CACHE is not set
@@ -1324,7 +1321,6 @@ CONFIG_SND_OMAP_SOC=y
 # SoC Audio for the Texas Instruments OMAP
 #
 CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_MCBSP=y
 
 #
 # Open Sound System
@@ -1791,8 +1787,8 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
============================================================
--- packages/linux/linux-omap2_git.bb	a05dfd66bdd95a25bffd9f9ea592f03165e7321e
+++ packages/linux/linux-omap2_git.bb	91d936879c9fac0d051b7c80b290a712b953d3e0
@@ -5,7 +5,7 @@ PV = "2.6.25+2.6.26-rc2+git${SRCREV}"
 SRCREV = "fe2c08002adea304a13ccb806aa1ab4058607094"
 
 PV = "2.6.25+2.6.26-rc2+git${SRCREV}"
-PR = "r14"
+PR = "r15"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
============================================================
--- packages/tasks/task-opie-16mb.bb	17a97e85093fb7c7aaba5ea5de08086d633dc185
+++ packages/tasks/task-opie-16mb.bb	cf1f25614ad8da263d528b3f34d314213dd05281
@@ -29,7 +29,7 @@ RDEPENDS_task-opie-16mb-applets = "opie-
                                    opie-screenshotapplet \
     ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
 PACKAGE_ARCH_task-opie-16mb-applets = "${MACHINE_ARCH}"
============================================================
--- packages/tasks/task-opie-all.bb	247d329aa6a21cecb1f4f74f1a838072b8aa22d8
+++ packages/tasks/task-opie-all.bb	e996923d71e129ec881e2b565c3689d4ce4c94c5
@@ -18,7 +18,7 @@ RDEPENDS_task-opie-applets = "opie-about
                      opie-clipboardapplet opie-clockapplet opie-homeapplet \
                      opie-irdaapplet opie-lockapplet opie-logoutapplet \
                      opie-mailapplet opie-memoryapplet opie-multikeyapplet \
-                     opie-networkapplet opie-notesapplet opie-pcmciaapplet \
+                     opie-networkapplet opie-notesapplet opie-cardapplet \
                      opie-pyquicklaunchapplet opie-restartapplet \
                      opie-restartapplet2 opie-rotateapplet \
                      opie-screenshotapplet opie-suspendapplet opie-vmemo \
============================================================
--- packages/tasks/task-opie.bb	78fbe261fe8ace945600c95b91627808e02cef52
+++ packages/tasks/task-opie.bb	ae01f0abcd042b147b21cd29141a481fd081fdb4
@@ -44,7 +44,7 @@ RDEPENDS_task-opie-base-applets = "opie-
                                    opie-screenshotapplet \
     ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
 PACKAGE_ARCH_task-opie-base-applets = "${MACHINE_ARCH}"
============================================================
--- packages/uclibc/uclibc_0.9.29.bb	2768d9ecc595b84f45ce4e80e84cf53949a8b652
+++ packages/uclibc/uclibc_0.9.29.bb	3283df3bb2a36857cc4cb9bd5bd8e5e3c3ea5b35
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r17"
+PR = "r18"
 
 require uclibc.inc
 
@@ -27,6 +27,7 @@ SRC_URI += "file://uClibc.machine file:/
 	    file://uClibc-0.9.29-rm-whitespace.patch;patch=1 \
             file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \
 	    file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \
+            file://arm_fix_alignment.patch;patch=1 \
            "
 
 #recent versions uclibc require real kernel headers

More information about the Openembedded-commits mailing list