org.openembedded.dev: e153c31c0ee27bb623ac342b60a8268535c866b6

oe at monotone.openmoko.org oe at monotone.openmoko.org
Fri May 2 21:06:54 CEST 2008 

revision:            e153c31c0ee27bb623ac342b60a8268535c866b6
date:                2008-05-01T22:03:23
author:              coredump2 at openembedded.org
branch:              org.openembedded.dev
changelog:
merge of '22d90510dcdbad0d05c38bbc2984c79754336a89'
     and 'bdf8f6761da7188dd5e88b5096a73feb0816d6b7'

manifest:
format_version "1"

new_manifest [2ed8a5b07d2d8f0caffbfd6ead507749cdf0f083]

old_revision [22d90510dcdbad0d05c38bbc2984c79754336a89]

rename "packages/altboot/altboot_1.1.1+wip-SVNR81.bb"
    to "packages/altboot/altboot_1.1.1+wip-SVNR82.bb"

patch "packages/altboot/altboot_1.1.1+wip-SVNR82.bb"
 from [3cb071a1265832774030a51d3885a1105bbc1a1a]
   to [30f225947018193be924446410bba918d4f77dcc]

old_revision [bdf8f6761da7188dd5e88b5096a73feb0816d6b7]

add_file "packages/boost/files/atomic_count_gcc_atomicity.patch"
 content [b9084da134967c9093506c230f9af87b2bf74373]

patch "conf/machine/beagleboard.conf"
 from [ed984e852b63ec950dba7f7bae3b3504a0b74fa6]
   to [0aca1472398cfb3f3a6fc65d9d84b22667811ff5]

patch "packages/binutils/binutils-avr32.inc"
 from [a7d324afa09eb724099f42b11b3b68772ef94d3e]
   to [7d4de5cdff8cbe23a79ceaf4ae9d202ba3b70583]

patch "packages/boost/boost_1.33.1.bb"
 from [9e61fbe13da215613e0df5e8e49a650c399e667d]
   to [f88f30ce00fdd7e116d616bca37b226e0075d922]

patch "packages/gnash/gnash-minimal_0.8.2.bb"
 from [f7c7319536d3a41d44075b2778c5090f9cfe3d7a]
   to [cab14e40ea2e0651767fbbc321620fc897c7e491]

patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
 from [be915c43601a85e473bfe81da31c8f2179696358]
   to [20e4cbd16fbc6711586e320ecc9be434d34cae66]

patch "packages/tasks/task-base.bb"
 from [50285a37437adccf62033cd89c0d329f69d4e191]
   to [4f3fba7e4b5f01a54b98411187bcbae655008613]
-------------- next part --------------
#
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR81.bb"
#     to "packages/altboot/altboot_1.1.1+wip-SVNR82.bb"
# 
# patch "packages/altboot/altboot_1.1.1+wip-SVNR82.bb"
#  from [3cb071a1265832774030a51d3885a1105bbc1a1a]
#    to [30f225947018193be924446410bba918d4f77dcc]
#
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR81.bb	3cb071a1265832774030a51d3885a1105bbc1a1a
+++ packages/altboot/altboot_1.1.1+wip-SVNR82.bb	30f225947018193be924446410bba918d4f77dcc
@@ -2,7 +2,7 @@ PR = "r0"
 
 PR = "r0"
 
-SVN_REV = "81"
+SVN_REV = "82"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
 	  "
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/28293691/attachment.htm 
-------------- next part --------------
#
#
# add_file "packages/boost/files/atomic_count_gcc_atomicity.patch"
#  content [b9084da134967c9093506c230f9af87b2bf74373]
# 
# patch "conf/machine/beagleboard.conf"
#  from [ed984e852b63ec950dba7f7bae3b3504a0b74fa6]
#    to [0aca1472398cfb3f3a6fc65d9d84b22667811ff5]
# 
# patch "packages/binutils/binutils-avr32.inc"
#  from [a7d324afa09eb724099f42b11b3b68772ef94d3e]
#    to [7d4de5cdff8cbe23a79ceaf4ae9d202ba3b70583]
# 
# patch "packages/boost/boost_1.33.1.bb"
#  from [9e61fbe13da215613e0df5e8e49a650c399e667d]
#    to [f88f30ce00fdd7e116d616bca37b226e0075d922]
# 
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
#  from [f7c7319536d3a41d44075b2778c5090f9cfe3d7a]
#    to [cab14e40ea2e0651767fbbc321620fc897c7e491]
# 
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
#  from [be915c43601a85e473bfe81da31c8f2179696358]
#    to [20e4cbd16fbc6711586e320ecc9be434d34cae66]
# 
# patch "packages/tasks/task-base.bb"
#  from [50285a37437adccf62033cd89c0d329f69d4e191]
#    to [4f3fba7e4b5f01a54b98411187bcbae655008613]
#
============================================================
--- packages/boost/files/atomic_count_gcc_atomicity.patch	b9084da134967c9093506c230f9af87b2bf74373
+++ packages/boost/files/atomic_count_gcc_atomicity.patch	b9084da134967c9093506c230f9af87b2bf74373
@@ -0,0 +1,13 @@
+Index: boost_1_33_1/boost/detail/atomic_count_gcc.hpp
+===================================================================
+--- boost_1_33_1.orig/boost/detail/atomic_count_gcc.hpp	2008-05-01 20:43:45.000000000 +0200
++++ boost_1_33_1/boost/detail/atomic_count_gcc.hpp	2008-05-01 20:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ //  http://www.boost.org/LICENSE_1_0.txt)
+ //
+ 
+-#include <bits/atomicity.h>
++#include <ext/atomicity.h>
+ 
+ namespace boost
+ {
============================================================
--- conf/machine/beagleboard.conf	ed984e852b63ec950dba7f7bae3b3504a0b74fa6
+++ conf/machine/beagleboard.conf	0aca1472398cfb3f3a6fc65d9d84b22667811ff5
@@ -14,9 +14,9 @@ TARGET_FPU = "hard"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 TARGET_FPU = "hard"
-#include conf/machine/include/tune-arm1136jf-s.inc
+include conf/machine/include/tune-arm1136jf-s.inc
 # requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
+#include conf/machine/include/tune-cortexa8.inc
 
 
 IMAGE_FSTYPES ?= "tar.bz2"
@@ -34,4 +34,4 @@ UBOOT_LOADADDRESS = "0x80008000"
 
 
 # and sdio
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat"
============================================================
--- packages/binutils/binutils-avr32.inc	a7d324afa09eb724099f42b11b3b68772ef94d3e
+++ packages/binutils/binutils-avr32.inc	7d4de5cdff8cbe23a79ceaf4ae9d202ba3b70583
@@ -5,18 +5,17 @@ do_avr32_reconf () {
 
 do_avr32_reconf () {
         if test ${TARGET_ARCH} == avr32; then
-            (cd ${S} && autoconf2.13) || die "Error running autoconf"
+            (cd ${S} && autoconf) || die "Error running autoconf"
             for dir in bfd opcodes binutils ld; do
                 (cd "${S}/$dir" &&
-                 aclocal-1.9 &&
+                 aclocal &&
                  autoconf &&
-                 automake-1.9 &&
+                 automake &&
                  autoheader) || die "Error reconfiguring $dir"
             done
         fi
 }
 
-
 do_avr32_configure_bfd () {
         if test ${TARGET_ARCH} == avr32; then
             (cd ${B} && make configure-bfd) || die "Error running 'make configure-bfd'"
@@ -24,8 +23,6 @@ do_avr32_configure_bfd () {
         fi
 }
 
-
-
 addtask avr32_reconf after do_patch before do_configure
 addtask avr32_configure_bfd after do_configure before do_compile
           
============================================================
--- packages/boost/boost_1.33.1.bb	9e61fbe13da215613e0df5e8e49a650c399e667d
+++ packages/boost/boost_1.33.1.bb	f88f30ce00fdd7e116d616bca37b226e0075d922
@@ -9,7 +9,7 @@ LICENSE = "Boost Software License"
 DEPENDS = "boost-jam-native zlib"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
-PR = "r0"
+PR = "r1"
 
 BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
 BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
@@ -17,6 +17,7 @@ SRC_URI += "file://linux-uclibc.patch;pa
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
 #SRC_URI += "file://unit_test_log10f.patch;patch=1"
 SRC_URI += "file://linux-uclibc.patch;patch=1"
+SRC_URI += "file://atomic_count_gcc_atomicity.patch;patch=1"
 
 S = "${WORKDIR}/${BOOST_P}"
 
============================================================
--- packages/gnash/gnash-minimal_0.8.2.bb	f7c7319536d3a41d44075b2778c5090f9cfe3d7a
+++ packages/gnash/gnash-minimal_0.8.2.bb	cab14e40ea2e0651767fbbc321620fc897c7e491
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1"
 
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS = "libxml2 libmad zlib boost jpeg pango curl freetype"
+DEPENDS = "agg libxml2 libmad zlib boost jpeg pango curl freetype"
 
 S = ${WORKDIR}/gnash-${PV}
 
============================================================
--- packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb	be915c43601a85e473bfe81da31c8f2179696358
+++ packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb	20e4cbd16fbc6711586e320ecc9be434d34cae66
@@ -26,10 +26,12 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
 		--with-sqlite-libs=${STAGING_LIBDIR} \
 		--without-athena --enable-dbus \
                 --with-libiw=${STAGING_EXECPREFIXDIR}"
-
 CFLAGS =+ "-I${S}/include"
 LDFLAGS += "-lz"
 
+# Ugly hack to find libstdc++ for libgps
+EXTRA_OEMAKE_append = 'CCLD="${CXX}"'
+
 FILES_${PN} = "${bindir}/prismstumbler"
 
 FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \
============================================================
--- packages/tasks/task-base.bb	50285a37437adccf62033cd89c0d329f69d4e191
+++ packages/tasks/task-base.bb	4f3fba7e4b5f01a54b98411187bcbae655008613
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r67"
+PR = "r68"
 
 inherit task
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/28293691/attachment-0001.htm

More information about the commitlog mailing list