fix attribute substitution in lirc

BKrev: 408e68d7L3d_DpcjcVCD5LInSpKZJw

2 files changed, 51 insertions, 5 deletions

diff --git a/lirc/lirc-modules_0.6.6.oe b/lirc/lirc-modules_0.6.6.oe
index e69de29bb2..aa6bebfff9 100644
--- a/lirc/lirc-modules_0.6.6.oe
+++ b/lirc/lirc-modules_0.6.6.oe
@@ -0,0 +1,47 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "linux-${KERNEL_VERSION}"
+DEPENDS = "virtual/kernel"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
+S = "${WORKDIR}/lirc-${PV}"
+
+inherit autotools
+
+export ARCH=${TARGET_ARCH}
+export OS=${TARGET_OS}
+export CROSS_COMPILE=${CROSS}
+
+KERNEL_VERSION = ${@open('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-version').read().strip()}
+KERNEL_SOURCE = ${@open('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source').read().strip()}
+KERNEL_PATH = "${STAGING_LIBDIR}/../kernel"
+
+export TOPDIR = "${KERNEL_SOURCE}"
+
+#FIXME: Caution: EXTRA_OECONF is arm-specific!
+
+EXTRA_OECONF = "--with-kerneldir=${KERNEL_SOURCE}                      \
+                --with-driver=sa1100                                   \ 
+                --without-x"
+
+do_compile() {
+	cd drivers && oe_runmake
+}
+
+do_install() {
+	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/char
+	install -m 755 drivers/lirc_sir/lirc_sir.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/char/lirc_sir.o
+}
+
+pkg_postinst() {
+#!/bin/sh
+ mknod /dev/lirc c 61 0
+ if [ -n $D ]; then exit 1; fi
+}
+
+PACKAGES_append=" lirc-modules"
+FILES_lirc-modules="/lib/modules"
+
diff --git a/lirc/lirc_0.6.6.oe b/lirc/lirc_0.6.6.oe
index 0414e9b326..b35b1c695f 100644
--- a/lirc/lirc_0.6.6.oe
+++ b/lirc/lirc_0.6.6.oe
@@ -11,9 +11,9 @@ S = "${WORKDIR}/lirc-${PV}"
 
 inherit autotools
 
-export KERNEL_VERSION = "`cat ${STAGING_LIBDIR}/../kernel/kernel-version`"
-export KERNEL_SOURCE = "`cat ${STAGING_LIBDIR}/../kernel/kernel-source`"
-export KERNEL_PATH = "${STAGING_LIBDIR}/../kernel"
+KERNEL_VERSION = ${@open('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-version').read().strip()}
+KERNEL_SOURCE = ${@open('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source').read().strip()}
+KERNEL_PATH = "${STAGING_LIBDIR}/../kernel"
 
 #FIXME: Caution: EXTRA_OECONF is arm-specific!
 
@@ -28,8 +28,6 @@ do_stage() {
 	install -m 0644 tools/lirc_client.h ${STAGING_INCDIR}/
 }
 
-#FIXME: Add to postinstall /bin/mknod $(DESTDIR)$(devdir)/lirc c 61 0
-
 do_install() {
 	install -d ${D}/${bindir}
 
@@ -37,3 +35,4 @@ do_install() {
 	install -m 755 daemons/lircd ${D}/${bindir}/lircd
 	install -m 755 tools/rc ${D}/${bindir}/rc
 }
+