From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 May 2004 14:44:52 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~19189
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a289369eb58e061f98259125101a11efdac4ec1;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/09 21:48:52+02:00 vanille.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/09 20:04:54+02:00 vanille.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/09 18:57:30+02:00 vanille.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/08 18:09:02+02:00 vanille.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/08 17:01:21+02:00 vanille.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/08 02:21:30+02:00 vanille.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/03 21:50:02+02:00 vanille.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/02 18:16:38+02:00 vanille.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/01 18:04:09+02:00 vanille.de!mickey
lirc,lirc-modules:use base_read_files instead of open

BKrev: 40a389e43H02oYaNOrzEXZ9W7_TtLQ
---

diff --git a/lirc/lirc-modules_0.6.6.oe b/lirc/lirc-modules_0.6.6.oe
index aa6bebfff9..7f254d8669 100644
--- a/lirc/lirc-modules_0.6.6.oe
+++ b/lirc/lirc-modules_0.6.6.oe
@@ -15,8 +15,8 @@ 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_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-version')}
+KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
 KERNEL_PATH = "${STAGING_LIBDIR}/../kernel"
 
 export TOPDIR = "${KERNEL_SOURCE}"
diff --git a/lirc/lirc_0.6.6.oe b/lirc/lirc_0.6.6.oe
index b067507589..b408962c3d 100644
--- a/lirc/lirc_0.6.6.oe
+++ b/lirc/lirc_0.6.6.oe
@@ -11,8 +11,8 @@ S = "${WORKDIR}/lirc-${PV}"
 
 inherit autotools
 
-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_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-version')}
+KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
 KERNEL_PATH = "${STAGING_LIBDIR}/../kernel"
 
 #FIXME: Caution: EXTRA_OECONF is arm-specific!