diff options
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb | 12 |
1 files changed, 7 insertions, 5 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 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("-", "\\\\-")}" |