diff options
| -rw-r--r-- | meta/packages/exmap-console/exmap-console.bb | 2 | ||||
| -rw-r--r-- | meta/packages/exmap-console/exmap-console.inc | 32 | ||||
| -rw-r--r-- | meta/packages/exmap-console/exmap-console_svn.bb | 27 |
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 9c6d62adb..a872dee33 100644 --- a/meta/packages/exmap-console/exmap-console.bb +++ b/meta/packages/exmap-console/exmap-console.bb @@ -1,4 +1,4 @@ -PV="0.3.1" +PV="0.4" require 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 37f226858..799b6da56 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" SECTION = "devel" LICENSE = "GPL" -SRCDATE="20061111" - SRC_URI = \ "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz" inherit module-base inherit autotools +MYPV := "${PV}" + +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" + S = "${WORKDIR}/exmap-console-${PV}" export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}" @@ -28,4 +44,14 @@ do_compile() { ${MAKE_TARGETS} } -FILES_${PN}="${sbindir} ${base_libdir}" +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 +} diff --git a/meta/packages/exmap-console/exmap-console_svn.bb b/meta/packages/exmap-console/exmap-console_svn.bb index a85b6484c..9e93847e6 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" HOMEPAGE = "http://www.o-hand.com" SECTION = "devel" LICENSE = "GPL" -PR = "r9" -SRCDATE=20070105 - -# HACK -- I want the kernel module version label to include both the -# exmap pacakge version and the kernel version, but it is not possible -# to use ${PV} in the definition of PV_kernel-module-exmap (complains -# about recursion, hence $MYPV +PR = "r10" PV = "0.4+svn${SRCDATE}" -MYPV = "0.4+svn${SRCDATE}" +MYPV := "${PV}" SRC_URI = \ "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http" @@ -23,15 +17,17 @@ PACKAGES += "exmap-server kernel-module-exmap" FILES_${PN}= "${bindir}/exmap ${bindir}/exmapd" PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}" -RDEPENDS_exmap-console = "kernel-module-exmap" +RDEPENDS_exmap-console += "kernel-module-exmap" FILES_exmap-server = "${bindir}/exmapserver" PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}" -RDEPENDS_exmap-server = "kernel-module-exmap" +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" S = "${WORKDIR}/exmap-console" @@ -50,3 +46,14 @@ do_compile() { ${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 +} |