[oe-commits] org.oe.dev exmap-console : Update from Poky. Builds now.

[crofton commit]

exmap-console : Update from Poky. Builds now.

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 036e2e71bb09d2efdeab9165b6946b947e4316b2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=036e2e71bb09d2efdeab9165b6946b947e4316b2
Files:
1
packages/exmap-console/exmap-console_0.4.bb
packages/exmap-console/exmap-console_0.4.1.bb
packages/exmap-console/exmap-console.inc
packages/exmap-console/exmap-console_svn.bb
Diffs:

#
# mt diff -r3ac53a3abe6d36dd6e47f00ed65baf933db9f936 -r036e2e71bb09d2efdeab9165b6946b947e4316b2
#
# 
# 
# delete "packages/exmap-console/exmap-console_0.4.bb"
# 
# add_file "packages/exmap-console/exmap-console_0.4.1.bb"
#  content [fcf738744d19e6d33be29ce3ffffb13dcd080b4a]
# 
# patch "packages/exmap-console/exmap-console.inc"
#  from [a823d75578539d9482a2b8059eeffb92c9ad576a]
#    to [63d7774ca1ed640b50ead734368313117dad3a6c]
# 
# patch "packages/exmap-console/exmap-console_svn.bb"
#  from [692eef7c990b82df32abcf1541536e75d0e09f8a]
#    to [9e500fd9df5191ba71310c281219b5b3dd9ab532]
# 
============================================================
--- packages/exmap-console/exmap-console_0.4.1.bb	fcf738744d19e6d33be29ce3ffffb13dcd080b4a
+++ packages/exmap-console/exmap-console_0.4.1.bb	fcf738744d19e6d33be29ce3ffffb13dcd080b4a
@@ -0,0 +1,3 @@
+require exmap-console.inc
+
+PR = "r4"
============================================================
--- packages/exmap-console/exmap-console.inc	a823d75578539d9482a2b8059eeffb92c9ad576a
+++ packages/exmap-console/exmap-console.inc	63d7774ca1ed640b50ead734368313117dad3a6c
@@ -1,61 +1,61 @@ LICENSE = "GPL"
 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"
+DEPENDS = "virtual/kernel readline"
 
 SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
 
+TEMPPACKAGE_ARCH := "${PACKAGE_ARCH}"
+
 inherit module-base
 inherit autotools
 
 MYPV := "${PV}"
+PACKAGE_ARCH = "${TEMPPACKAGE_ARCH}"
 
-PACKAGES += "exmap-server kernel-module-exmap"
+PACKAGES =+ "exmap-server kernel-module-exmap"
 
 FILES_exmap-console = "${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})"
+RDEPENDS_kernel-module-exmap += "update-modules kernel-image-${KERNEL_VERSION}"
 
 S = "${WORKDIR}/exmap-console-${PV}"
 
 export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}"
 
 do_compile() {
-    cd ${S}/src
-    make
+	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}
+	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}
 }
 
 do_install() {
-    oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install
+	oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install
 }
 
 pkg_postinst_append_kernel-module-exmap () {
-    if [ -n "$D" ]; then
-        exit 1
-    fi
-    depmod -a
-    update-modules || true
+	if [ -n "$D" ]; then
+		exit 1
+	fi
+	depmod -a
+	update-modules || true
 }
 
 pkg_postrm_append_kernel-module-exmap () {
-    update-modules || true
+	update-modules || true
 }
-
============================================================
--- packages/exmap-console/exmap-console_svn.bb	692eef7c990b82df32abcf1541536e75d0e09f8a
+++ packages/exmap-console/exmap-console_svn.bb	9e500fd9df5191ba71310c281219b5b3dd9ab532
@@ -1,5 +1,7 @@
-PR = "r10"
+require exmap-console.inc
+
 PV = "0.4+svn${SRCDATE}"
+PR = "r14"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
 
@@ -7,4 +9,3 @@ PV_kernel-module-exmap = "${MYPV}-${KERN
 
 MYPV := "${PV}"
 PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
-