[oe-commits] : classpath: simplfiy patch handling for native and minimal

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.dev
Commit: fc814bd5255c4c227caeba7e958569d4afbb3ca2
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=fc814bd5255c4c227caeba7e958569d4afbb3ca2

Author:  <woglinde2 at openembedded.org>
Date:   Wed Sep 24 01:05:48 2008 +0000

classpath: simplfiy patch handling for native and minimal
* maninpulate FILESDIR as suggested in the oe manual,
  so we don't need a patch thrice
* drop the extrad dirs and patches
* do not need bump PR no runtime changes

---

 .../classpath-minimal-0.97.2/autotools.patch       |   13 -------------
 packages/classpath/classpath-minimal_0.97.2.bb     |    2 ++
 .../classpath-native-0.97.2/autotools.patch        |   13 -------------
 packages/classpath/classpath-native.inc            |   10 +++++-----
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty b/packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch
deleted file mode 100644
index e36e143..0000000
--- a/packages/classpath/classpath-minimal-0.97.2/autotools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: classpath-0.97.2/configure.ac
-===================================================================
---- classpath-0.97.2.orig/configure.ac	2008-06-06 02:58:57.000000000 +0200
-+++ classpath-0.97.2/configure.ac	2008-08-02 00:58:16.537364104 +0200
-@@ -41,6 +41,8 @@
- AC_CONFIG_HEADERS([include/config.h])
- AC_PREFIX_DEFAULT(/usr/local/classpath)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- dnl -----------------------------------------------------------
- dnl Enable collections.jar (disabled by default)
- dnl -----------------------------------------------------------
diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb
index 44cffce..e03dc85 100644
--- a/packages/classpath/classpath-minimal_0.97.2.bb
+++ b/packages/classpath/classpath-minimal_0.97.2.bb
@@ -1,5 +1,7 @@
 require classpath.inc
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/${PBN}-${PV}"
+
 SRC_URI += "\
   file://netif_16.patch;patch=1;pnum=0 \
   file://SimpleName.diff;patch=1;pnum=0 \
diff --git a/packages/classpath/classpath-native-0.97.2/.mtn2git_empty b/packages/classpath/classpath-native-0.97.2/.mtn2git_empty
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch
deleted file mode 100644
index e36e143..0000000
--- a/packages/classpath/classpath-native-0.97.2/autotools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: classpath-0.97.2/configure.ac
-===================================================================
---- classpath-0.97.2.orig/configure.ac	2008-06-06 02:58:57.000000000 +0200
-+++ classpath-0.97.2/configure.ac	2008-08-02 00:58:16.537364104 +0200
-@@ -41,6 +41,8 @@
- AC_CONFIG_HEADERS([include/config.h])
- AC_PREFIX_DEFAULT(/usr/local/classpath)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- dnl -----------------------------------------------------------
- dnl Enable collections.jar (disabled by default)
- dnl -----------------------------------------------------------
diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc
index 060dd3f..d178ce6 100644
--- a/packages/classpath/classpath-native.inc
+++ b/packages/classpath/classpath-native.inc
@@ -2,15 +2,15 @@ DESCRIPTION = "GNU Classpath standard Java libraries - For native Java-dependent
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 
-S = "${WORKDIR}/classpath-${PV}"
-
-SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
-	  
+inherit autotools native
 
 DEPENDS = "ecj-initial fastjar-native zip-native gettext-native"
 
-inherit autotools native
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+S = "${WORKDIR}/classpath-${PV}"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/classpath-${PV}"
 
 do_configure_prepend () {