Skip to contentSkip to conversation

meta-initramfs: remove True option to getVar calls (again)

PATCH New André Draszik 1 participant 1 message Jan 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meta-initramfs: remove True option to getVar calls (again)

From: André Draszik <[email protected]>

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)
---
 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb +2 -2
index b285b2e8b..ab2afb7f8 100644
@@ -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
 }
 
Signature · 1 line
2.20.1