[oe-commits] Ross Burton : chkconfig: use explicit directories in obey_variables()

git at git.openembedded.org git at git.openembedded.org
Mon Jul 20 09:42:06 UTC 2015


Module: openembedded-core.git
Branch: master-next
Commit: 74b1757e080d14188fe9f77f6e07ed83b696a2c8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=74b1757e080d14188fe9f77f6e07ed83b696a2c8

Author: Ross Burton <ross.burton at intel.com>
Date:   Tue Jul 14 15:49:13 2015 +0100

chkconfig: use explicit directories in obey_variables()

obey_variables() was using relative paths which mean it depends on exactly what
directory it starts in.  To clarify the code, always use absolute paths.

Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index d285c50..8df87f8 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -36,10 +36,10 @@ EXTRA_OEMAKE = "\
 do_unpack[postfuncs] += "obey_variables"
 do_unpack[vardeps] += "obey_variables"
 obey_variables () {
-	sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' leveldb.h
+	sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h
 	sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \
 	       -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \
-	       -e 's,/usr/share/locale,${datadir}/locale,' alternatives.c
+	       -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c
 }
 
 do_install() {



More information about the Openembedded-commits mailing list