[oe-commits] org.oe.dev merge of '7092ab793b40d9bf0352adda7cb0de9e9d1b53d9'

[oe commit]

merge of '7092ab793b40d9bf0352adda7cb0de9e9d1b53d9'
     and 'ed60cd7b6b6312ef6a4497d871d3c2f91ca6b369'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 714f8404b02451929d6ca37a4f8a38beffae0322
ViewMTN: http://monotone.openembedded.org/revision.psp?id=714f8404b02451929d6ca37a4f8a38beffae0322
Files:
1
packages/glibmm/glibmm_2.8.4.bb
packages/glibmm/glibmm_2.12.10.bb
packages/cairo/cairomm_1.2.4.bb
packages/db/db_4.3.29.bb
packages/tasks/task-boot.bb
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-dsmg600.h
Diffs:

#
# mt diff -r7092ab793b40d9bf0352adda7cb0de9e9d1b53d9 -r714f8404b02451929d6ca37a4f8a38beffae0322
#
# 
# 
# rename "packages/glibmm/glibmm_2.8.4.bb"
#     to "packages/glibmm/glibmm_2.12.10.bb"
# 
# add_file "packages/cairo/cairomm_1.2.4.bb"
#  content [dd66a4dedd593fd19a3dbdd501692b451e67cc22]
# 
# patch "packages/db/db_4.3.29.bb"
#  from [ac62c653321f799c3e82eb83e6f784a82d29ae22]
#    to [1435118c93b68e2c0ac08756d52aa21da920348a]
# 
# patch "packages/glibmm/glibmm_2.12.10.bb"
#  from [f65adea3541283a9f134c688ceb34d8dae685f2e]
#    to [79ded0998e146ec9831dfbc0391c51bd8ca5d611]
# 
# patch "packages/tasks/task-boot.bb"
#  from [115ab0b2bdb81d2173743f94013740150247661e]
#    to [f0102706fa429388765dd03fb5cbad2d98527a2f]
# 
============================================================
--- packages/cairo/cairomm_1.2.4.bb	dd66a4dedd593fd19a3dbdd501692b451e67cc22
+++ packages/cairo/cairomm_1.2.4.bb	dd66a4dedd593fd19a3dbdd501692b451e67cc22
@@ -0,0 +1,9 @@
+require cairo.inc
+
+DEPENDS = "cairo"
+DESCRIPTION = "C++ bindings for Cairo graphics library"
+PR = "r0"
+
+SRC_URI = "http://cairographics.org/releases/cairomm-${PV}.tar.gz"
+
+#EXTRA_OECONF = "--disable-docs"
============================================================
--- packages/db/db_4.3.29.bb	ac62c653321f799c3e82eb83e6f784a82d29ae22
+++ packages/db/db_4.3.29.bb	1435118c93b68e2c0ac08756d52aa21da920348a
@@ -14,7 +14,7 @@ CONFLICTS = "db3"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
 #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
@@ -71,6 +71,7 @@ do_configure() {
 # configure.
 CONFIG_SITE = ""
 do_configure() {
+	( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize ) 
 	oe_runconf
 }
 
============================================================
--- packages/glibmm/glibmm_2.8.4.bb	f65adea3541283a9f134c688ceb34d8dae685f2e
+++ packages/glibmm/glibmm_2.12.10.bb	79ded0998e146ec9831dfbc0391c51bd8ca5d611
@@ -1,12 +1,12 @@ DEPENDS = "glib-2.0 libsigc++-2.0"
 DESCRIPTION = "C++ bindings for the glib library."
 HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 libsigc++-2.0"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-${PV}.tar.bz2"
 
 inherit autotools pkgconfig flow-lossage
 
@@ -19,6 +19,5 @@ do_stage () {
 	autotools_stage_all
 
 	install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4
-
 	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/
 }
============================================================
--- packages/tasks/task-boot.bb	115ab0b2bdb81d2173743f94013740150247661e
+++ packages/tasks/task-boot.bb	f0102706fa429388765dd03fb5cbad2d98527a2f
@@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a devic
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r36"
+PR = "r37"
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = 'task-boot'
@@ -46,11 +46,9 @@ RDEPENDS_task-boot = "\
     ${DISTRO_DEV_MANAGER} \
     ${DISTRO_INIT_MANAGER} \
     ${DISTRO_LOGIN_MANAGER} \
-    ${DISTRO_EXTRA_RDEPENDS} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
-    ${MACHINE_EXTRA_RDEPENDS}"
+    "
 
 RRECOMMENDS_task-boot = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
+    "
-    ${MACHINE_EXTRA_RRECOMMENDS} \
-    ${DISTRO_EXTRA_RRECOMMENDS} "


#
# mt diff -red60cd7b6b6312ef6a4497d871d3c2f91ca6b369 -r714f8404b02451929d6ca37a4f8a38beffae0322
#
# 
# 
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
#  from [03183c3151029ae4353feb0d5f2cafdbc9bfbe49]
#    to [363539e6aa9b48b4075ef6f22841c250058075ba]
# 
# patch "packages/arm-kernel-shim/files/config-dsmg600.h"
#  from [d00909cd9a1463bc0408385eccc82a7aabbdb7f4]
#    to [e1e4b562c2e75b563db67b4f23659eb5d2586f41]
# 
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.5.bb	03183c3151029ae4353feb0d5f2cafdbc9bfbe49
+++ packages/arm-kernel-shim/arm-kernel-shim_1.5.bb	363539e6aa9b48b4075ef6f22841c250058075ba
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "ARM Kernel Shim"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
 
============================================================
--- packages/arm-kernel-shim/files/config-dsmg600.h	d00909cd9a1463bc0408385eccc82a7aabbdb7f4
+++ packages/arm-kernel-shim/files/config-dsmg600.h	e1e4b562c2e75b563db67b4f23659eb5d2586f41
@@ -18,6 +18,8 @@
 
 #define MACH_TYPE		   964
 
+#define GUARANTEE_ATAG_CMDLINE
+
 /* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN