From 08133da144d95bbbdc83a74fab1f9851e90aa3c6 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 16 Oct 2007 15:17:36 +0000
Subject: uboot/files/makefile-no-dirafter.patch : this patch is more general

---
 packages/uboot/files/makefile-no-dirafter.patch         | 17 +++++++++++++++++
 .../makefile-no-dirafter.patch                          | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 packages/uboot/files/makefile-no-dirafter.patch
 delete mode 100644 packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch

diff --git a/packages/uboot/files/makefile-no-dirafter.patch b/packages/uboot/files/makefile-no-dirafter.patch
new file mode 100644
index 0000000000..2ed26c3127
--- /dev/null
+++ b/packages/uboot/files/makefile-no-dirafter.patch
@@ -0,0 +1,17 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile	2007-10-03 16:51:38.000000000 +0100
++++ git/tools/Makefile	2007-10-03 16:52:03.000000000 +0100
+@@ -114,9 +114,9 @@
+ #
+ # Use native tools and options
+ #
+-CPPFLAGS   = -idirafter $(SRCTREE)/include \
+-		-idirafter $(OBJTREE)/include2 \
+-		-idirafter $(OBJTREE)/include \
++CPPFLAGS   = -I$(SRCTREE)/include \
++		-I$(OBJTREE)/include2 \
++		-I$(OBJTREE)/include \
+ 		-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
+ CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
+ AFLAGS	   = -D__ASSEMBLY__ $(CPPFLAGS)
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch b/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
deleted file mode 100644
index 2ed26c3127..0000000000
--- a/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: git/tools/Makefile
-===================================================================
---- git.orig/tools/Makefile	2007-10-03 16:51:38.000000000 +0100
-+++ git/tools/Makefile	2007-10-03 16:52:03.000000000 +0100
-@@ -114,9 +114,9 @@
- #
- # Use native tools and options
- #
--CPPFLAGS   = -idirafter $(SRCTREE)/include \
--		-idirafter $(OBJTREE)/include2 \
--		-idirafter $(OBJTREE)/include \
-+CPPFLAGS   = -I$(SRCTREE)/include \
-+		-I$(OBJTREE)/include2 \
-+		-I$(OBJTREE)/include \
- 		-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
- CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
- AFLAGS	   = -D__ASSEMBLY__ $(CPPFLAGS)
-- 
cgit v1.2.3


From 64fc5a98886b44916d57091506c0ae3115a055f1 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 16 Oct 2007 15:18:13 +0000
Subject: 
 packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
 : add patch to stop pulling in files from host by accident

---
 ...openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
index 2a09c76f09..1cee1edf37 100644
--- a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
+++ b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
@@ -19,6 +19,7 @@ SRC_URI = "\
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+  file://makefile-no-dirafter.patch;patch=1 \
 "
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-- 
cgit v1.2.3


From fe9ae0df9e6965c26631296f351546b100551404 Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Tue, 16 Oct 2007 15:25:27 +0000
Subject: slugos-packages: Added curl and cups

---
 packages/meta/slugos-packages.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index e74fe9424c..7960be85eb 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r39"
+PR = "r40"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -50,6 +50,8 @@ SLUGOS_PACKAGES = "\
 	cron \
 	ctorrent \
 	ctrlproxy \
+	cups \
+	curl \
 	cvs \
 	cyrus-imapd \
 	cyrus-sasl \
-- 
cgit v1.2.3