Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

6 files changed, 121 insertions, 9 deletions

diff --git a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
index e69de29bb2..4cd87bba34 100644
--- a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
+++ b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
@@ -0,0 +1,34 @@
+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 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "kernel"
+DEPENDS = "virtual/kernel"
+PR = "r2"
+
+S = "${WORKDIR}/lirc"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/lirc;module=lirc;date=20040918;method=pserver \
+file://lirc_sir-sa1100.patch;patch=1"
+
+inherit autotools module-base
+
+EXTRA_OECONF = "--with-kerneldir=${STAGING_KERNEL_DIR}"
+EXTRA_OECONF_append_epia = " --with-driver=serial"
+EXTRA_OECONF_append_collie = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_h3600 = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_beagle = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_simpad = " --with-driver=sa1100 --without-x"
+
+export TOPDIR = "${STAGING_KERNEL_DIR}"
+
+do_compile() {
+	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+}
+
+fakeroot do_install() {
+	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
+	rm -rf ${D}dev
+}
+
+FILES_${PN}="/lib/modules"
diff --git a/packages/lirc/lirc-modules_0.6.6.bb b/packages/lirc/lirc-modules_0.6.6.bb
index 6235156148..7073bab8d8 100644
--- a/packages/lirc/lirc-modules_0.6.6.bb
+++ b/packages/lirc/lirc-modules_0.6.6.bb
@@ -24,8 +24,8 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char
-	install -m 0644 drivers/lirc_sir/lirc_sir.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char/lirc_sir.o
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char
+	install -m 0644 drivers/lirc_sir/lirc_sir.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char/lirc_sir.o
 }
 
 pkg_postinst() {
diff --git a/packages/lirc/lirc-modules_0.7.0.bb b/packages/lirc/lirc-modules_0.7.0.bb
index e69de29bb2..c87fe06a98 100644
--- a/packages/lirc/lirc-modules_0.7.0.bb
+++ b/packages/lirc/lirc-modules_0.7.0.bb
@@ -0,0 +1,39 @@
+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 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel fakeroot-native"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
+           file://lirc_sir-sa1100.patch;patch=1"
+S = "${WORKDIR}/lirc-${PV}"
+
+inherit autotools module-base
+
+EXTRA_OECONF = "--with-kerneldir=${STAGING_KERNEL_DIR}"
+EXTRA_OECONF_append_epia = " --with-driver=serial"
+EXTRA_OECONF_append_collie = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_h3600 = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_beagle = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_simpad = " --with-driver=sa1100 --without-x"
+
+export TOPDIR = "${STAGING_KERNEL_DIR}"
+
+do_compile() {
+	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+}
+
+fakeroot do_install() {
+	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
+	rm -rf ${D}dev
+}
+
+pkg_postinst() {
+#!/bin/sh
+ mknod /dev/lirc c 61 0
+ if [ -n $D ]; then exit 1; fi
+}
+
+FILES_${PN} = "/lib/modules"
diff --git a/packages/lirc/lirc_0.6.6+cvs20040918.bb b/packages/lirc/lirc_0.6.6+cvs20040918.bb
index 9949c0a4dd..4f3a9f5928 100644
--- a/packages/lirc/lirc_0.6.6+cvs20040918.bb
+++ b/packages/lirc/lirc_0.6.6+cvs20040918.bb
@@ -32,17 +32,17 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
+	install -d ${D}${bindir}
 
-	install -m 755 daemons/irrecord ${D}/${bindir}/irrecord
-	install -m 755 daemons/lircd ${D}/${bindir}/lircd
+	install -m 755 daemons/irrecord ${D}${bindir}/irrecord
+	install -m 755 daemons/lircd ${D}${bindir}/lircd
 
 	oe_libinstall -so -C tools liblirc_client ${D}${libdir}/
 	install -d ${D}${includedir}
 	install -m 0644 tools/lirc_client.h ${D}${includedir}/
 
-	install -d ${D}/${sysconfdir}/init.d
-	install ${WORKDIR}/lircd.init ${D}/${sysconfdir}/init.d/lircd
+	install -d ${D}${sysconfdir}/init.d
+	install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd
 
 	install -d ${D}${datadir}/lirc/
 	cp -a remotes ${D}${datadir}/lirc/
diff --git a/packages/lirc/lirc_0.6.6.bb b/packages/lirc/lirc_0.6.6.bb
index e69de29bb2..ca9168198c 100644
--- a/packages/lirc/lirc_0.6.6.bb
+++ b/packages/lirc/lirc_0.6.6.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
+SECTION = "console/network"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+PR = "r5"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
+S = "${WORKDIR}/lirc-${PV}"
+
+inherit autotools module-base
+
+EXTRA_OECONF_epia = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=serial"
+EXTRA_OECONF_collie = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_h3600 = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_beagle = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_simpad = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+
+EXTRA_OEMAKE = 'SUBDIRS="daemons tools"'
+
+do_stage() {
+        oe_libinstall -so -C tools liblirc_client ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/lirc/
+	install -m 0644 tools/lirc_client.h ${STAGING_INCDIR}/lirc/
+}
+
+do_install() {
+	install -d ${D}${bindir}
+
+	install -m 755 daemons/irrecord ${D}${bindir}/irrecord
+	install -m 755 daemons/lircd ${D}${bindir}/lircd
+	install -m 755 tools/rc ${D}${bindir}/rc
+
+	oe_libinstall -so -C tools liblirc_client ${D}${libdir}/
+	install -d ${D}${includedir}
+	install -m 0644 tools/lirc_client.h ${D}${includedir}/
+}
+
diff --git a/packages/lirc/lirc_0.7.0.bb b/packages/lirc/lirc_0.7.0.bb
index eb062770bc..4de5432aae 100644
--- a/packages/lirc/lirc_0.7.0.bb
+++ b/packages/lirc/lirc_0.7.0.bb
@@ -31,8 +31,8 @@ do_stage() {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install ${WORKDIR}/lircd.init ${D}/${sysconfdir}/init.d/lircd
+	install -d ${D}${sysconfdir}/init.d
+	install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd
 
         install -d ${D}${datadir}/lirc/
         cp -a ${S}/remotes ${D}${datadir}/lirc/