[oe-commits] org.oe.dev merge of '714f8404b02451929d6ca37a4f8a38beffae0322'

[oe commit]

merge of '714f8404b02451929d6ca37a4f8a38beffae0322'
     and 'c3bf7d428ff163b2d84f615a9787148c42aefa89'

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

#
# mt diff -r714f8404b02451929d6ca37a4f8a38beffae0322 -r6125010e94f0d761a3e97f29f9c53c71ae696107
#
# 
# 
# patch "packages/linux/linux.inc"
#  from [06e3cd51af5792d89ccd3dca0d5ef3f6e25d33a8]
#    to [571ad2731ad0b3d6172a72c2f807cbcc9bb6c840]
# 
============================================================
--- packages/linux/linux.inc	06e3cd51af5792d89ccd3dca0d5ef3f6e25d33a8
+++ packages/linux/linux.inc	571ad2731ad0b3d6172a72c2f807cbcc9bb6c840
@@ -18,7 +18,11 @@ KERNEL_IMAGETYPE_at91sam9263ek = "uImage
 KERNEL_IMAGETYPE_at91sam9263ek = "uImage"
 
 # Specify the commandline for you device here:
+
+#boot from mmc
 CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"
+#boot from nfs
+#CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0"
 
 do_configure_prepend() {
         echo "" > ${S}/.config
@@ -43,11 +47,11 @@ do_install_prepend() {
 
 do_install_prepend() {
         if test -e arch/${ARCH}/boot/Image ; then
-             ln -f arch/arm/boot/Image arch/arm/boot/uImage
+             ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage
         fi
 
         if test -e arch/${ARCH}/boot/images/uImage ; then
-             ln -f arch/arm/boot/images/uImage arch/arm/boot/uImage
+             ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage
         fi
 }
 


#
# mt diff -rc3bf7d428ff163b2d84f615a9787148c42aefa89 -r6125010e94f0d761a3e97f29f9c53c71ae696107
#
# 
# 
# 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/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]
# 
# patch "packages/glibmm/glibmm_2.12.10.bb"
#  from [f65adea3541283a9f134c688ceb34d8dae685f2e]
#    to [79ded0998e146ec9831dfbc0391c51bd8ca5d611]
# 
# patch "packages/tasks/task-boot.bb"
#  from [29b83ee5d7b88a0372d216ecb74f747c1ec365e6]
#    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/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
============================================================
--- 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	29b83ee5d7b88a0372d216ecb74f747c1ec365e6
+++ 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'