merge of 84ac7904b3e5b86a16d2ba1acac2d5a0876f3af4

     and d45556cc21173533cecace2eefbf3115a7563e06

9 files changed, 1 insertions, 295 deletions

diff --git a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
deleted file mode 100644
index a08d26e1dc..0000000000
--- a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-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 = "r3"
-
-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_simpad = " --with-driver=sa1100 --without-x"
-
-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
deleted file mode 100644
index 9622739d3e..0000000000
--- a/packages/lirc/lirc-modules_0.6.6.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-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 = "linux-${KERNEL_VERSION}"
-DEPENDS = "virtual/kernel"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
-S = "${WORKDIR}/lirc-${PV}"
-
-inherit autotools module-base
-
-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_simpad = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
-
-do_compile() {
-	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-}
-
-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
-}
-
-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-modules_0.7.0.bb b/packages/lirc/lirc-modules_0.7.0.bb
deleted file mode 100644
index 99b0fabd31..0000000000
--- a/packages/lirc/lirc-modules_0.7.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-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 = "r3"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
-           file://lirc_sir-sa1100.patch;patch=1"
-S = "${WORKDIR}/lirc-${PV}"
-
-inherit autotools module-base
-
-include lirc-config.inc
-
-do_compile() {
-	# ${KERNEL_LD} doesn't understand the LDFLAGS, so suppress them
-	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" LDFLAGS=""
-}
-
-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-modules_0.7.1.bb b/packages/lirc/lirc-modules_0.7.1.bb
deleted file mode 100644
index 0bf709ee92..0000000000
--- a/packages/lirc/lirc-modules_0.7.1.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-
-include lirc-config.inc
-
-do_compile() {
-	# ${KERNEL_LD} doesn't understand the LDFLAGS, so suppress them
-	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" LDFLAGS=""
-}
-
-fakeroot do_install() {
-	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
-	rm -rf ${D}/dev
-}
-
-pkg_postinst() {
-#!/bin/sh
-set -e
-if [ ! -c $D/dev/lirc ]; then mknod $D/dev/lirc c 61 0; fi
-exit 0
-}
-
-FILES_${PN} = "/lib/modules"
diff --git a/packages/lirc/lirc-modules_0.8.0.bb b/packages/lirc/lirc-modules_0.8.0.bb
index 4ba4637f5a..563720a892 100644
--- a/packages/lirc/lirc-modules_0.8.0.bb
+++ b/packages/lirc/lirc-modules_0.8.0.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls. This package contains the lirc kernel modules."
 SECTION = "base"
 PRIORITY = "optional"
-HOMEPAGE = "http://www.lirc.org"
 MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
+HOMEPAGE = "http://www.lirc.org"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native setserial"
 RDEPENDS_nslu2 = "setserial"
diff --git a/packages/lirc/lirc_0.6.6+cvs20040918.bb b/packages/lirc/lirc_0.6.6+cvs20040918.bb
deleted file mode 100644
index 1bebdff849..0000000000
--- a/packages/lirc/lirc_0.6.6+cvs20040918.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-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"
-RDEPENDS = "kernel lirc-modules-${PV}"
-DEPENDS = "virtual/kernel"
-PR = "r8"
-
-S = "${WORKDIR}/lirc"
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/lirc;module=lirc;date=20040918;method=pserver \
-	file://split-hauppauge.patch;patch=1 \
-	file://lircd.init file://lircmd.init"
-
-inherit autotools module-base update-rc.d
-
-INITSCRIPT_NAME = "lirc"
-INITSCRIPT_PARAMS = "defaults 20"
-
-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_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
-
-	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}${datadir}/lirc/
-	cp -pPR remotes ${D}${datadir}/lirc/
-	find ${D}${datadir}/lirc -name CVS -o -name '*~*' | xargs rm -rf
-}
-
diff --git a/packages/lirc/lirc_0.6.6.bb b/packages/lirc/lirc_0.6.6.bb
deleted file mode 100644
index 7b304837cd..0000000000
--- a/packages/lirc/lirc_0.6.6.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-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 = "r6"
-
-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_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
deleted file mode 100644
index 4d4f69f922..0000000000
--- a/packages/lirc/lirc_0.7.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-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 = "r6"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
-      file://split-hauppauge.patch;patch=1 \
-      file://lircd.init file://lircmd.init"
-S = "${WORKDIR}/lirc-${PV}"
-
-inherit autotools module-base update-rc.d
-
-INITSCRIPT_NAME = "lirc"
-INITSCRIPT_PARAMS = "defaults 20"
-
-include lirc-config.inc
-
-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_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd
-
-        install -d ${D}${datadir}/lirc/
-        cp -pPR ${S}/remotes ${D}${datadir}/lirc/
-}
-
diff --git a/packages/lirc/lirc_0.7.1.bb b/packages/lirc/lirc_0.7.1.bb
deleted file mode 100644
index cd65dcedae..0000000000
--- a/packages/lirc/lirc_0.7.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-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 libx11 libxau libsm libice"
-PR = "r5"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
-      file://lircd.init file://lircmd.init"
-S = "${WORKDIR}/lirc-${PV}"
-
-inherit autotools module-base update-rc.d
-
-INITSCRIPT_NAME = "lircd"
-INITSCRIPT_PARAMS = "defaults 20"
-
-include lirc-config.inc
-
-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_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd
-
-        install -d ${D}${datadir}/lirc/
-        cp -pPR ${S}/remotes ${D}${datadir}/lirc/
-}
-
-PACKAGES =+ "lirc-x"
-
-FILES_lirc-x = "${bindir}/irxevent ${bindir}/xmode2"