From 95cf19fe31e791b4fd20f6e743c910c7a16f1cb8 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 11 Dec 2006 13:55:04 +0000
Subject: libeventdb: use the new GPE svn repo

---
 packages/libeventdb/libeventdb_cvs.bb | 18 ------------------
 packages/libeventdb/libeventdb_svn.bb | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 packages/libeventdb/libeventdb_cvs.bb
 create mode 100644 packages/libeventdb/libeventdb_svn.bb

diff --git a/packages/libeventdb/libeventdb_cvs.bb b/packages/libeventdb/libeventdb_cvs.bb
deleted file mode 100644
index 3ea70bac01..0000000000
--- a/packages/libeventdb/libeventdb_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION  = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
-PV = "0.30+cvs${SRCDATE}"
-PR = "r0"
-DEFAULT_PREFERENCE = "-1"
-
-inherit pkgconfig gpe autotools
-
-SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}"
-
-S = "${WORKDIR}/${PN}"
-
-do_stage () {
-autotools_stage_all
-}
diff --git a/packages/libeventdb/libeventdb_svn.bb b/packages/libeventdb/libeventdb_svn.bb
new file mode 100644
index 0000000000..4f00f4aac8
--- /dev/null
+++ b/packages/libeventdb/libeventdb_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Database access library for GPE calendar"
+LICENSE     = "LGPL"
+SECTION  = "gpe/libs"
+PRIORITY = "optional"
+
+DEPENDS  = "libgpewidget libgpepimc sqlite"
+
+PV = "0.30+svn${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit pkgconfig gpe autotools
+
+SRC_URI = "${GPE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage () {
+    autotools_stage_all
+}
-- 
cgit v1.2.3


From adf5a49dd346b412db24a3455ac126d345e69185 Mon Sep 17 00:00:00 2001
From: Andrew Wilcox <andy@protium.com>
Date: Mon, 11 Dec 2006 14:06:02 +0000
Subject: linux-storcenter: missing depend on uboot-utils for mkimage

---
 packages/linux/linux-storcenter_2.6.12.6.bb | 1 +
 packages/uboot-utils/uboot-utils_1.1.2.bb   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb
index 280cb5bd62..541f881fd0 100644
--- a/packages/linux/linux-storcenter_2.6.12.6.bb
+++ b/packages/linux/linux-storcenter_2.6.12.6.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Linux Kernel for the Iomega storcenter platform"
 SECTION = "kernel"
 LICENSE = "GPL"
+DEPENDS = "uboot-utils"
 PR = "r0"
 
 # notes on iom def kernel:
diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb
index d70a055d2f..a24682af45 100644
--- a/packages/uboot-utils/uboot-utils_1.1.2.bb
+++ b/packages/uboot-utils/uboot-utils_1.1.2.bb
@@ -26,6 +26,11 @@ do_compile () {
 	oe_runmake tools
 }
 
+# install mkimage for the kernel makefile
+do_stage() {
+	install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}
+}
+
 do_install () {
 	install -d     ${D}/sbin
 	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv
-- 
cgit v1.2.3


From 0cd1e202e170f7c6f61329427122e51263cf2ca9 Mon Sep 17 00:00:00 2001
From: Andrew Wilcox <andy@protium.com>
Date: Mon, 11 Dec 2006 14:57:41 +0000
Subject: apache2-native: doesn't build if native apr is found.

---
 packages/apache2/apache2-native_2.2.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb
index f961d7863a..9c6c862ad7 100644
--- a/packages/apache2/apache2-native_2.2.3.bb
+++ b/packages/apache2/apache2-native_2.2.3.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 S = "${WORKDIR}/httpd-${PV}"
 
 do_configure () {
-	./configure --prefix=${prefix}
+	./configure --with-included-apr --prefix=${prefix}
 }
 
 do_populate_staging () {
-- 
cgit v1.2.3