summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-02-22 08:38:46 +0000
committerRichard Purdie <richard@openedhand.com>2007-02-22 08:38:46 +0000
commit21690b1b6efe1815e79b80ec9ba5c700daf9ebc9 (patch)
treedcb76ee869da12d8e3e7a208a53335332c82ec54 /meta
parent4caa95d0fca863acd39780d704667528b11cd879 (diff)
downloadpoky-21690b1b6efe1815e79b80ec9ba5c700daf9ebc9.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/exmap-console/exmap-console.bb4
-rw-r--r--meta/packages/exmap-console/exmap-console.inc11
-rw-r--r--meta/packages/exmap-console/exmap-console_0.4.bb1
-rw-r--r--meta/packages/exmap-console/exmap-console_svn.bb58
4 files changed, 11 insertions, 63 deletions
diff --git a/meta/packages/exmap-console/exmap-console.bb b/meta/packages/exmap-console/exmap-console.bb
deleted file mode 100644
index a872dee337..0000000000
--- a/meta/packages/exmap-console/exmap-console.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1
2PV="0.4"
3
4require exmap-console.inc \ No newline at end of file
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 @@
1DESCRIPTION = "console-based exmap" 1DESCRIPTION = "Console based version of exmap, a memory usage analysis tool"
2HOMEPAGE = "http://www.o-hand.com" 2HOMEPAGE = "http://projects.o-hand.com/exmap-console"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "GPL" 4LICENSE = "GPL"
5DEPENDS = "virtual/kernel"
5 6
6SRC_URI = \ 7SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
7 "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
8 8
9inherit module-base 9inherit module-base
10inherit autotools 10inherit autotools
@@ -13,7 +13,7 @@ MYPV := "${PV}"
13 13
14PACKAGES += "exmap-server kernel-module-exmap" 14PACKAGES += "exmap-server kernel-module-exmap"
15 15
16FILES_${PN}= "${bindir}/exmap ${bindir}/exmapd" 16FILES_exmap-console = "${bindir}/exmap ${bindir}/exmapd"
17PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}" 17PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
18RDEPENDS_exmap-console += "kernel-module-exmap" 18RDEPENDS_exmap-console += "kernel-module-exmap"
19 19
@@ -25,7 +25,6 @@ FILES_kernel-module-exmap = "${base_libdir}"
25PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}" 25PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
26PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}" 26PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
27RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})" 27RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
28DEPENDS_kernel-module-exmap += "virtual/kernel"
29 28
30S = "${WORKDIR}/exmap-console-${PV}" 29S = "${WORKDIR}/exmap-console-${PV}"
31 30
diff --git a/meta/packages/exmap-console/exmap-console_0.4.bb b/meta/packages/exmap-console/exmap-console_0.4.bb
new file mode 100644
index 0000000000..ffdded1889
--- /dev/null
+++ b/meta/packages/exmap-console/exmap-console_0.4.bb
@@ -0,0 +1 @@
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 @@
1DESCRIPTION = "console-based exmap" 1require exmap-console.inc
2HOMEPAGE = "http://www.o-hand.com"
3SECTION = "devel"
4LICENSE = "GPL"
5PR = "r10"
6 2
3PR = "r10"
7PV = "0.4+svn${SRCDATE}" 4PV = "0.4+svn${SRCDATE}"
8MYPV := "${PV}"
9
10SRC_URI = \
11 "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
12 5
13inherit module-base 6SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
14inherit autotools
15
16PACKAGES += "exmap-server kernel-module-exmap"
17
18FILES_${PN}= "${bindir}/exmap ${bindir}/exmapd"
19PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
20RDEPENDS_exmap-console += "kernel-module-exmap"
21
22FILES_exmap-server = "${bindir}/exmapserver"
23PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}"
24RDEPENDS_exmap-server += "kernel-module-exmap"
25
26FILES_kernel-module-exmap = "${base_libdir}"
27PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
28PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
29RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
30DEPENDS_kernel-module-exmap += "virtual/kernel"
31 7
32S = "${WORKDIR}/exmap-console" 8S = "${WORKDIR}/exmap-console"
33 9
34export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}" 10MYPV := "${PV}"
35 11PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
36do_compile() {
37 cd ${S}/src
38 make
39
40 cd ${S}/kernel
41 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
42 oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
43 KERNEL_SRC=${STAGING_KERNEL_DIR} \
44 KERNEL_VERSION=${KERNEL_VERSION} \
45 CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
46 ${MAKE_TARGETS}
47}
48
49pkg_postinst_append_kernel-module-exmap () {
50 if [ -n "$D" ]; then
51 exit 1
52 fi
53 depmod -a
54 update-modules || true
55}
56
57pkg_postrm_append_kernel-module-exmap () {
58 update-modules || true
59}