]> code.ossystems Code Review - openembedded-core.git/commitdiff
chkconfig: use explicit directories in obey_variables()
authorRoss Burton <ross.burton@intel.com>
Tue, 14 Jul 2015 14:49:13 +0000 (15:49 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 16 Jul 2015 14:08:45 +0000 (15:08 +0100)
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@intel.com>
meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb

index d285c5047cb7a295b34609aa72761387859f41a7..8df87f88fbda0031c9b259e5091577690197906f 100644 (file)
@@ -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() {