From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 20 Mar 2008 07:58:48 +0000 (+0000)
Subject: merge
X-Git-Tag: Release-2010-05/1~7106^2^2~3^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=393fd0ff7b74d92b1754dffcdf8769936365d183;p=openembedded.git

merge
---

diff --git a/packages/images/openmoko-minimal-image.bb b/packages/images/openmoko-minimal-image.bb
deleted file mode 100644
index 15506c42e3..0000000000
--- a/packages/images/openmoko-minimal-image.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-#------------------------------------------------------
-# OpenMoko Minimal Image Recipe
-# other openmoko images should include this.
-# -----------------------------------------------------
-
-IMAGE_LINGUAS = ""
-
-IMAGE_INSTALL = "\
-  ${MACHINE_TASK_PROVIDER} \
-  task-openmoko-linux \
-  "
-
-DEPENDS = "\
-  ${MACHINE_TASK_PROVIDER} \
-  task-openmoko-linux \
-  "
-
-
-inherit image
-
-ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
diff --git a/packages/intltool/intltool-native_0.37.1.bb b/packages/intltool/intltool-native_0.37.1.bb
deleted file mode 100644
index bac5378113..0000000000
--- a/packages/intltool/intltool-native_0.37.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require intltool_${PV}.bb
-
-inherit native
-DEPENDS = "libxml-parser-perl-native"
-
-export PERL = "/usr/bin/env perl"
-SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
diff --git a/packages/intltool/intltool_0.37.1.bb b/packages/intltool/intltool_0.37.1.bb
deleted file mode 100644
index e48262574b..0000000000
--- a/packages/intltool/intltool_0.37.1.bb
+++ /dev/null
@@ -1 +0,0 @@
-require intltool.inc
diff --git a/packages/swt/files/make_linux-fix.patch b/packages/swt/files/make_linux-fix.patch
deleted file mode 100644
index 1c98f5cad2..0000000000
--- a/packages/swt/files/make_linux-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: swt-source/make_linux.mak
-===================================================================
---- swt-source.orig/make_linux.mak	2008-01-23 15:08:02.000000000 +0800
-+++ swt-source/make_linux.mak	2008-01-23 15:08:21.000000000 +0800
-@@ -74,8 +74,6 @@
- 	-Wno-non-virtual-dtor \
- 	-fPIC \
- 	-I. \
--	-I$(JAVA_HOME)/include \
--	-I$(JAVA_HOME)/include/linux \
- 	${SWT_PTR_CFLAGS}
- MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
- MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
-@@ -96,8 +94,6 @@
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DLINUX -DGTK \
--		-I$(JAVA_HOME)/include \
--		-I$(JAVA_HOME)/include/linux \
- 		-fPIC \
- 		${SWT_PTR_CFLAGS}
- LIBS = -shared -fPIC