From f4fd9a02898b2c2826c8a6fe575b0fe7bfea5cd8 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 13 Feb 2017 23:32:35 +0100 Subject: klcc-cross: fixes for recipe specific sysroot The klcc script encodes the paths with custom escaping. As stated in the patch "Turn the horribly encoded paths into something which sstate can transform using its ususal magic by removing all the crazy escaping". Signed-off-by: Richard Purdie Signed-off-by: Andrea Adami Signed-off-by: Martin Jansa --- meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meta-initramfs') 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 3a4e7b52ad..15d860a9f0 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 @@ -17,8 +17,13 @@ do_compile() { do_install() { install -d ${D}${bindir_crossscripts}/ install -m 0755 klcc/klcc ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc - # Insert an unencoded path as a comment to trigger the sstate renaming functions - sed -i '2i #${STAGING_DIR_TARGET}' ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc + # Turn the horribly encoded paths into something which sstate can transform using its ususal + # 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' \ + ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc } SYSROOT_PREPROCESS_FUNCS += "klcc_sysroot_preprocess" @@ -35,6 +40,3 @@ deltask do_package_write_deb deltask do_package_write_tar SSTATE_SCAN_FILES = "*" -EXTRA_STAGING_FIXMES = "MANGLEDSTAGINGDIRTARGET MANGLEDSTAGINGDIR" -MANGLEDSTAGINGDIR = "${@d.getVar("STAGING_DIR").replace("/", "\\\\/").replace("-", "\\\\-")}" -MANGLEDSTAGINGDIRTARGET = "${@d.getVar("STAGING_DIR_TARGET").replace("/", "\\\\/").replace("-", "\\\\-")}" -- cgit 1.2.3-korg