[oe-commits] Paul Eggleton : lcdproc: fix do_install for S!=B
git at git.openembedded.org
git at git.openembedded.org
Sat Jun 21 09:38:53 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: cf2140877b403bec838ac81aeb7b820eee79ee86
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=cf2140877b403bec838ac81aeb7b820eee79ee86
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Tue Jun 17 18:34:57 2014 +0100
lcdproc: fix do_install for S!=B
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-extended/lcdproc/lcdproc5.inc | 4 ++--
meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
index d1a45ca..91329d8 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
@@ -36,10 +36,10 @@ do_install () {
sed -i s'/--oknodo//' ${D}${sysconfdir}/init.d/lcdproc
# configuration files
- install -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
+ install -m 0644 ${S}/LCDd.conf ${D}${sysconfdir}/LCDd.conf
sed -i 's!^DriverPath=.*!DriverPath=${libdir}/lcdproc/!' ${D}${sysconfdir}/LCDd.conf
sed -i 's!^Driver=.*!Driver=${LCD_DEFAULT_DRIVER}!' ${D}${sysconfdir}/LCDd.conf
- install -m 0644 clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
+ install -m 0644 ${S}/clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
# driver library files
install -d ${D}${libdir}/lcdproc
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
index 39e6074..1f9524d 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
@@ -15,7 +15,7 @@ do_install_append () {
install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
# configuration files
- install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
+ install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
}
PACKAGES =+ "lcdvc"
More information about the Openembedded-commits
mailing list