summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/arm-kernel-shim/arm-kernel-shim_1.5.bb2
-rw-r--r--packages/arm-kernel-shim/files/config-dsmg600.h2
-rw-r--r--packages/cairo/cairomm_1.2.4.bb9
-rw-r--r--packages/glibmm/glibmm_2.12.10.bb (renamed from packages/glibmm/glibmm_2.8.4.bb)5
-rw-r--r--packages/tasks/task-boot.bb2
5 files changed, 15 insertions, 5 deletions
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
index 4bdf7a86e3..0788f81609 100644
--- a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
@@ -3,7 +3,7 @@ SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h
index eda1e9c264..ebe53901b8 100644
--- a/packages/arm-kernel-shim/files/config-dsmg600.h
+++ b/packages/arm-kernel-shim/files/config-dsmg600.h
@@ -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
diff --git a/packages/cairo/cairomm_1.2.4.bb b/packages/cairo/cairomm_1.2.4.bb
new file mode 100644
index 0000000000..7796a44016
--- /dev/null
+++ b/packages/cairo/cairomm_1.2.4.bb
@@ -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"
diff --git a/packages/glibmm/glibmm_2.8.4.bb b/packages/glibmm/glibmm_2.12.10.bb
index 1819114cb1..a62d4eb145 100644
--- a/packages/glibmm/glibmm_2.8.4.bb
+++ b/packages/glibmm/glibmm_2.12.10.bb
@@ -4,9 +4,9 @@ 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/
}
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 4ef20fe3ac..3d08f465ba 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Basic task to get a device booting"
-PR = "r36"
+PR = "r37"
PROVIDES = "${PACKAGES}"
PACKAGES = 'task-boot'