[oe-commits] [meta-openembedded] 01/04: meta-initramfs: remove True option to getVar calls (again)

git at git.openembedded.org git at git.openembedded.org
Sun Jan 13 18:28:49 UTC 2019


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 88f2b979caf24fad736b8e378cf9daa142ae0567
Author: André Draszik <andre.draszik at jci.com>
AuthorDate: Sun Jan 13 10:54:35 2019 +0000

    meta-initramfs: remove True option to getVar calls (again)
    
    A couple have still been missed in the past despite multiple
    attempts at doing so (or simply have re-appeared?).
    
    Search & replace made using the following command:
        sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
            -i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
                 | cut -d':' -f1 \
                 | sort -u)
    
    Signed-off-by: André Draszik <andre.draszik at jci.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
index b285b2e..ab2afb7 100644
--- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
@@ -25,8 +25,8 @@ do_install() {
     # magic by removing all the crazy escaping.
     sed -i -e "2i \$TARGETSYSROOT = '${STAGING_DIR_TARGET}';" \
            -e "2i \$NATIVESYSROOT = '${STAGING_DIR_NATIVE}';" \
-           -e 's#${@d.getVar("STAGING_DIR_NATIVE", True).replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${NATIVESYSROOT}#g;' \
-           -e 's#${@d.getVar("STAGING_DIR_TARGET", True).replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${TARGETSYSROOT}#g' \
+           -e 's#${@d.getVar("STAGING_DIR_NATIVE").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${NATIVESYSROOT}#g;' \
+           -e 's#${@d.getVar("STAGING_DIR_TARGET").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${TARGETSYSROOT}#g' \
         ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list