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

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

2005/06/14 11:36:37+01:00 reciva.com!pb
correct INITSCRIPT_NAME

2005/06/14 11:06:27+01:00 reciva.com!pb
set kernel preference for sun4cdm

2005/06/14 10:58:13+01:00 reciva.com!pb
inhibit PARALLEL_MAKE for flite

BKrev: 42aeb409TXTYe8xPRc0MG84jRn5F2Q

diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf
index e69de29..ec4957d 100644 (file)
--- a/conf/machine/sun4cdm.conf
+++ b/conf/machine/sun4cdm.conf
@@ -0,0 +1,15 @@
+TARGET_ARCH = "sparc"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-sun4c"
+IMAGE_FSTYPE = "cramfs"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel module-init-tools udev"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev"
+
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.5"
+
+IPKG_ARCHS = "sparc"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-sun4cdm"
+

diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index 240de51..6fedda7 100644 (file)
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -6,6 +6,8 @@ LICENSE = "flite"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r1"
 
+PARALLEL_MAKE = ""
+
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \
            file://fix-read-only-assignments.patch;patch=1"
 S = "${WORKDIR}/flite-${PV}-release"

diff --git a/packages/lirc/lirc_0.7.1.bb b/packages/lirc/lirc_0.7.1.bb
index e69de29..fd3f890 100644 (file)
--- a/packages/lirc/lirc_0.7.1.bb
+++ b/packages/lirc/lirc_0.7.1.bb
@@ -0,0 +1,35 @@
+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 = "r1"
+
+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 -a ${S}/remotes ${D}${datadir}/lirc/
+}
+