[oe-commits] org.oe.dev merge of '32d243e53a633a69a4061e712897dae706da9eee'

[oe commit]

merge of '32d243e53a633a69a4061e712897dae706da9eee'
     and '816470cc5a58c92e0a2b36e6ca0db599d2cf7e38'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: afa51d1bd3a6d0684595da996d34d4923676187f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=afa51d1bd3a6d0684595da996d34d4923676187f
Files:
1
packages/0xFFFF/0xffff-native_0.1.bb
packages/0xFFFF/0xffff-native_0.2.bb
conf/distro/angstrom-2008.1.conf
packages/sylpheed/claws-mail.inc
Diffs:

#
# mt diff -r32d243e53a633a69a4061e712897dae706da9eee -rafa51d1bd3a6d0684595da996d34d4923676187f
#
# 
# 
# patch "packages/0xFFFF/0xffff-native_0.1.bb"
#  from [959e24359ef14785c97c6811de8c9643c2220911]
#    to [9fe366f3c4a323fa13c2760d0a98dccd34c7b039]
# 
# patch "packages/0xFFFF/0xffff-native_0.2.bb"
#  from [959e24359ef14785c97c6811de8c9643c2220911]
#    to [6445347dafc9298970ccd8e2389c8f4a0c1d84f6]
# 
============================================================
--- packages/0xFFFF/0xffff-native_0.1.bb	959e24359ef14785c97c6811de8c9643c2220911
+++ packages/0xFFFF/0xffff-native_0.1.bb	9fe366f3c4a323fa13c2760d0a98dccd34c7b039
@@ -5,12 +5,14 @@ do_stage() {
 inherit native
 
 do_stage() {
-        install -m 755 0xFFFF ${STAGING_BINDIR_NATIVE}
+        install -d ${STAGING_BINDIR_NATIVE}
+	install -m 755 0xFFFF ${STAGING_BINDIR_NATIVE}
 }
 
 do_deploy[dirs] = "${S}"
 
 do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
         install -m 755 0xFFFF ${DEPLOY_DIR_IMAGE}
 }
 
============================================================
--- packages/0xFFFF/0xffff-native_0.2.bb	959e24359ef14785c97c6811de8c9643c2220911
+++ packages/0xFFFF/0xffff-native_0.2.bb	6445347dafc9298970ccd8e2389c8f4a0c1d84f6
@@ -5,12 +5,14 @@ do_stage() {
 inherit native
 
 do_stage() {
+        install -d ${STAGING_BINDIR_NATIVE}
         install -m 755 0xFFFF ${STAGING_BINDIR_NATIVE}
 }
 
 do_deploy[dirs] = "${S}"
 
 do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
         install -m 755 0xFFFF ${DEPLOY_DIR_IMAGE}
 }
 


#
# mt diff -r816470cc5a58c92e0a2b36e6ca0db599d2cf7e38 -rafa51d1bd3a6d0684595da996d34d4923676187f
#
# 
# 
# 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 () {