summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Frydrych <tf@openedhand.com>2007-01-05 09:19:33 (GMT)
committerTomas Frydrych <tf@openedhand.com>2007-01-05 09:19:33 (GMT)
commit3206bb360094335117b45a30913ca90e727e7137 (patch)
treedbb006a3e0f38c14aa74f973b225280ca250250a
parent4b8a009013623827def90080c1408d2e0deeadc4 (diff)
downloadpoky-3206bb360094335117b45a30913ca90e727e7137.tar.gz
bump up version to 0.4; add missing RDEPENDS and DEPENDS and post install script
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1117 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/exmap-console/exmap-console.bb2
-rw-r--r--meta/packages/exmap-console/exmap-console.inc32
-rw-r--r--meta/packages/exmap-console/exmap-console_svn.bb27
3 files changed, 47 insertions, 14 deletions
diff --git a/meta/packages/exmap-console/exmap-console.bb b/meta/packages/exmap-console/exmap-console.bb
index 9c6d62a..a872dee 100644
--- a/meta/packages/exmap-console/exmap-console.bb
+++ b/meta/packages/exmap-console/exmap-console.bb
@@ -1,4 +1,4 @@
1 1
2PV="0.3.1" 2PV="0.4"
3 3
4require exmap-console.inc \ No newline at end of file 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 37f2268..799b6da 100644
--- a/meta/packages/exmap-console/exmap-console.inc
+++ b/meta/packages/exmap-console/exmap-console.inc
@@ -3,14 +3,30 @@ HOMEPAGE = "http://www.o-hand.com"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "GPL" 4LICENSE = "GPL"
5 5
6SRCDATE="20061111"
7
8SRC_URI = \ 6SRC_URI = \
9 "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"
10 8
11inherit module-base 9inherit module-base
12inherit autotools 10inherit autotools
13 11
12MYPV := "${PV}"
13
14PACKAGES += "exmap-server kernel-module-exmap"
15
16FILES_${PN}= "${bindir}/exmap ${bindir}/exmapd"
17PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
18RDEPENDS_exmap-console += "kernel-module-exmap"
19
20FILES_exmap-server = "${bindir}/exmapserver"
21PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}"
22RDEPENDS_exmap-server += "kernel-module-exmap"
23
24FILES_kernel-module-exmap = "${base_libdir}"
25PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
26PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
27RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
28DEPENDS_kernel-module-exmap += "virtual/kernel"
29
14S = "${WORKDIR}/exmap-console-${PV}" 30S = "${WORKDIR}/exmap-console-${PV}"
15 31
16export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}" 32export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}"
@@ -28,4 +44,14 @@ do_compile() {
28 ${MAKE_TARGETS} 44 ${MAKE_TARGETS}
29} 45}
30 46
31FILES_${PN}="${sbindir} ${base_libdir}" 47pkg_postinst_append_kernel-module-exmap () {
48 if [ -n "$D" ]; then
49 exit 1
50 fi
51 depmod -a
52 update-modules || true
53}
54
55pkg_postrm_append_kernel-module-exmap () {
56 update-modules || true
57}
diff --git a/meta/packages/exmap-console/exmap-console_svn.bb b/meta/packages/exmap-console/exmap-console_svn.bb
index a85b648..9e93847 100644
--- a/meta/packages/exmap-console/exmap-console_svn.bb
+++ b/meta/packages/exmap-console/exmap-console_svn.bb
@@ -2,16 +2,10 @@ DESCRIPTION = "console-based exmap"
2HOMEPAGE = "http://www.o-hand.com" 2HOMEPAGE = "http://www.o-hand.com"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "GPL" 4LICENSE = "GPL"
5PR = "r9" 5PR = "r10"
6SRCDATE=20070105
7
8# HACK -- I want the kernel module version label to include both the
9# exmap pacakge version and the kernel version, but it is not possible
10# to use ${PV} in the definition of PV_kernel-module-exmap (complains
11# about recursion, hence $MYPV
12 6
13PV = "0.4+svn${SRCDATE}" 7PV = "0.4+svn${SRCDATE}"
14MYPV = "0.4+svn${SRCDATE}" 8MYPV := "${PV}"
15 9
16SRC_URI = \ 10SRC_URI = \
17 "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http" 11 "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
@@ -23,15 +17,17 @@ PACKAGES += "exmap-server kernel-module-exmap"
23 17
24FILES_${PN}= "${bindir}/exmap ${bindir}/exmapd" 18FILES_${PN}= "${bindir}/exmap ${bindir}/exmapd"
25PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}" 19PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
26RDEPENDS_exmap-console = "kernel-module-exmap" 20RDEPENDS_exmap-console += "kernel-module-exmap"
27 21
28FILES_exmap-server = "${bindir}/exmapserver" 22FILES_exmap-server = "${bindir}/exmapserver"
29PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}" 23PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}"
30RDEPENDS_exmap-server = "kernel-module-exmap" 24RDEPENDS_exmap-server += "kernel-module-exmap"
31 25
32FILES_kernel-module-exmap = "${base_libdir}" 26FILES_kernel-module-exmap = "${base_libdir}"
33PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}" 27PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
34PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}" 28PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
29RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
30DEPENDS_kernel-module-exmap += "virtual/kernel"
35 31
36S = "${WORKDIR}/exmap-console" 32S = "${WORKDIR}/exmap-console"
37 33
@@ -50,3 +46,14 @@ do_compile() {
50 ${MAKE_TARGETS} 46 ${MAKE_TARGETS}
51} 47}
52 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}