[oe-commits] org.oe.dev merge of '0c14edad9fe9be01f3dcd8bb7481391246756938'

[koen commit]

merge of '0c14edad9fe9be01f3dcd8bb7481391246756938'
     and 'afa51d1bd3a6d0684595da996d34d4923676187f'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: aecb5449b058ab384abd56fc88126c50d11c09c9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aecb5449b058ab384abd56fc88126c50d11c09c9
Files:
1
conf/distro/angstrom-2008.1.conf
packages/sylpheed/claws-mail.inc
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom.inc
Diffs:

#
# mt diff -r0c14edad9fe9be01f3dcd8bb7481391246756938 -raecb5449b058ab384abd56fc88126c50d11c09c9
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [db66ecf290b2cc5303e089d928c440e0e7fb7614]
#    to [783879e52665932b7ebc461dd753e4481635d326]
# 
# patch "packages/sylpheed/claws-mail.inc"
#  from [70dc56c3455d2a0844a513547e62dd0a066acb6f]
#    to [e5e9e5019fbe720b04bda75c8c0d5f602d636ffa]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	db66ecf290b2cc5303e089d928c440e0e7fb7614
+++ conf/distro/angstrom-2008.1.conf	783879e52665932b7ebc461dd753e4481635d326
@@ -18,19 +18,19 @@ DISTRO_REVISION = "0"
 DISTRO_VERSION = "2008.1-test-${DATE}"
 DISTRO_REVISION = "0"
 
-PREFERRED_VERSION_gcc               ?= "4.2.1"
-PREFERRED_VERSION_gcc-cross         ?= "4.2.1"
+PREFERRED_VERSION_gcc               = "4.2.1"
+PREFERRED_VERSION_gcc-cross         = "4.2.1"
 
-PREFERRED_VERSION_binutils          ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross    ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils          = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross    = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
+PREFERRED_VERSION_linux-libc-headers = "2.6.22"
 
-#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "2.6"
-PREFERRED_VERSION_glibc-intermediate ?= "2.6"
-PREFERRED_VERSION_glibc-initial ?= "2.6"
+#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
+PREFERRED_VERSION_glibc = "2.6"
+PREFERRED_VERSION_glibc-intermediate = "2.6"
+PREFERRED_VERSION_glibc-initial = "2.6"
 
 
============================================================
--- packages/sylpheed/claws-mail.inc	70dc56c3455d2a0844a513547e62dd0a066acb6f
+++ packages/sylpheed/claws-mail.inc	e5e9e5019fbe720b04bda75c8c0d5f602d636ffa
@@ -33,19 +33,11 @@ inherit autotools pkgconfig
 
 inherit autotools pkgconfig
 
-
-do_configure() {
-	gnu-configize
-	libtoolize --force
-	oe_runconf
-}
-
 do_install_append() {
 	install -d ${D}${datadir}/applications
 	install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
 	install -d ${D}${datadir}/pixmaps
 	install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
-	mv ${D}${bindir}/${TARGET_SYS}-claws-mail ${D}${bindir}/${PN}
 }
 
 do_stage () {


#
# mt diff -rafa51d1bd3a6d0684595da996d34d4923676187f -raecb5449b058ab384abd56fc88126c50d11c09c9
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [2088874891974b3204e2218dbdbdefd2fc9b2280]
#    to [2406e68d4e8cbe30cc09d989cb0d9893e74a16e1]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [372f7c2d334de7c0bd564fab1b098f77a81b4b28]
#    to [153fe46201645e319494ecbf5e652eccbf033960]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	2088874891974b3204e2218dbdbdefd2fc9b2280
+++ conf/distro/angstrom-2007.1.conf	2406e68d4e8cbe30cc09d989cb0d9893e74a16e1
@@ -123,6 +123,11 @@ FEED_ARCH_nslu2be 	= "armv5teb"
 FEED_ARCH_ixp4xxbe 	= "armv5teb"
 FEED_ARCH_nslu2be 	= "armv5teb"
 
+# armv6
+
+FEED_ARCH_mx31ads 	= "armv6"
+FEED_ARCH_nokia800	= "armv6"  
+ 
 #i486 machines
 FEED_ARCH_geodegx 	= "i486"
 FEED_ARCH_geodelx 	= "i486"
============================================================
--- conf/distro/include/angstrom.inc	372f7c2d334de7c0bd564fab1b098f77a81b4b28
+++ conf/distro/include/angstrom.inc	153fe46201645e319494ecbf5e652eccbf033960
@@ -29,6 +29,7 @@ ENABLE_BINARY_LOCALE_GENERATION_mx31ads 
 
 #qemu doesn't like armv6/eabi/vfp
 ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0"
+ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0"
 
 #ARM EABI is softfloat by default, but let's make sure :)
 #make it overridable for platforms with FPU, like ep93xx or i.mx31