3 files changed, 10 insertions, 62 deletions
diff --git a/meta/packages/exmap-console/exmap-console.inc b/meta/packages/exmap-console/exmap-console.inc
index 3ebe21c8b..bdd1fdd44 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
index a872dee33..ffdded188 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 9e93847e6..684ff6aac 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"
-PR = "r10"
+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}"