From 21690b1b6efe1815e79b80ec9ba5c700daf9ebc9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 22 Feb 2007 08:38:46 +0000
Subject: [PATCH] exmap-console: Use filename to set PV, remove duplication
 from svn version, set DEPENDS correctly

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1285 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/exmap-console/exmap-console.inc | 11 ++--
 ...{exmap-console.bb => exmap-console_0.4.bb} |  3 -
 .../exmap-console/exmap-console_svn.bb        | 58 ++-----------------
 3 files changed, 10 insertions(+), 62 deletions(-)
 rename meta/packages/exmap-console/{exmap-console.bb => exmap-console_0.4.bb} (69%)

diff --git a/meta/packages/exmap-console/exmap-console.inc b/meta/packages/exmap-console/exmap-console.inc
index 3ebe21c8ba..bdd1fdd44c 100644
--- a/meta/packages/exmap-console/exmap-console.inc
+++ b/meta/packages/exmap-console/exmap-console.inc
@@ -1,10 +1,10 @@
-DESCRIPTION = "console-based exmap"
-HOMEPAGE = "http://www.o-hand.com"
+DESCRIPTION = "Console based version of exmap, a memory usage analysis tool"
+HOMEPAGE = "http://projects.o-hand.com/exmap-console"
 SECTION = "devel"
 LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
 
-SRC_URI = \
-    "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
+SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
 
 inherit module-base
 inherit autotools
@@ -13,7 +13,7 @@ MYPV := "${PV}"
 
 PACKAGES += "exmap-server kernel-module-exmap"
 
-FILES_${PN}= "${bindir}/exmap ${bindir}/exmapd"
+FILES_exmap-console = "${bindir}/exmap ${bindir}/exmapd"
 PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
 RDEPENDS_exmap-console += "kernel-module-exmap"
 
@@ -25,7 +25,6 @@ FILES_kernel-module-exmap = "${base_libdir}"
 PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
 PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
 RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
-DEPENDS_kernel-module-exmap += "virtual/kernel"
 
 S = "${WORKDIR}/exmap-console-${PV}"
 
diff --git a/meta/packages/exmap-console/exmap-console.bb b/meta/packages/exmap-console/exmap-console_0.4.bb
similarity index 69%
rename from meta/packages/exmap-console/exmap-console.bb
rename to meta/packages/exmap-console/exmap-console_0.4.bb
index a872dee337..ffdded1889 100644
--- a/meta/packages/exmap-console/exmap-console.bb
+++ b/meta/packages/exmap-console/exmap-console_0.4.bb
@@ -1,4 +1 @@
-
-PV="0.4"
-
 require exmap-console.inc
\ No newline at end of file
diff --git a/meta/packages/exmap-console/exmap-console_svn.bb b/meta/packages/exmap-console/exmap-console_svn.bb
index 9e93847e6d..684ff6aac3 100644
--- a/meta/packages/exmap-console/exmap-console_svn.bb
+++ b/meta/packages/exmap-console/exmap-console_svn.bb
@@ -1,59 +1,11 @@
-DESCRIPTION = "console-based exmap"
-HOMEPAGE = "http://www.o-hand.com"
-SECTION = "devel"
-LICENSE = "GPL"
+require exmap-console.inc
+
 PR = "r10"
-
 PV = "0.4+svn${SRCDATE}"
-MYPV := "${PV}"
 
-SRC_URI = \
-    "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
-
-inherit module-base
-inherit autotools
-
-PACKAGES += "exmap-server kernel-module-exmap"
-
-FILES_${PN}= "${bindir}/exmap ${bindir}/exmapd"
-PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
-RDEPENDS_exmap-console += "kernel-module-exmap"
-
-FILES_exmap-server = "${bindir}/exmapserver"
-PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}"
-RDEPENDS_exmap-server += "kernel-module-exmap"
-
-FILES_kernel-module-exmap = "${base_libdir}"
-PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
-PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
-RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
-DEPENDS_kernel-module-exmap += "virtual/kernel"
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
 
 S = "${WORKDIR}/exmap-console"
 
-export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}"
-
-do_compile() {
-	cd ${S}/src
-	make
-
-	cd ${S}/kernel
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-		   KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-		   KERNEL_VERSION=${KERNEL_VERSION}    \
-		   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-		   ${MAKE_TARGETS}
-}
-
-pkg_postinst_append_kernel-module-exmap () {
-	if [ -n "$D" ]; then
-		exit 1
-	fi
-	depmod -a
-	update-modules || true
-}
-
-pkg_postrm_append_kernel-module-exmap () {
-	update-modules || true
-}
+MYPV := "${PV}"
+PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"