diff options
-rw-r--r-- | meta/classes/multilib.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index ee677da1e2..9a8b02d4f6 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
@@ -106,7 +106,6 @@ python __anonymous () { | |||
106 | d.setVar("LINGUAS_INSTALL", "") | 106 | d.setVar("LINGUAS_INSTALL", "") |
107 | # FIXME, we need to map this to something, not delete it! | 107 | # FIXME, we need to map this to something, not delete it! |
108 | d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "") | 108 | d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "") |
109 | bb.build.deltask('do_populate_sdk', d) | ||
110 | bb.build.deltask('do_populate_sdk_ext', d) | 109 | bb.build.deltask('do_populate_sdk_ext', d) |
111 | return | 110 | return |
112 | 111 | ||
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index ca56d803cb..b46f1aed27 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -66,7 +66,7 @@ python () { | |||
66 | 66 | ||
67 | SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" | 67 | SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" |
68 | SDK_DEPENDS = "virtual/fakeroot-native ${SDK_ARCHIVE_DEPENDS} cross-localedef-native nativesdk-qemuwrapper-cross ${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross" | 68 | SDK_DEPENDS = "virtual/fakeroot-native ${SDK_ARCHIVE_DEPENDS} cross-localedef-native nativesdk-qemuwrapper-cross ${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross" |
69 | PATH_prepend = "${STAGING_DIR_HOST}${SDKPATHNATIVE}${bindir}/crossscripts:${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" | 69 | PATH_prepend = "${WORKDIR}/recipe-sysroot/${SDKPATHNATIVE}${bindir}/crossscripts:${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" |
70 | SDK_DEPENDS += "nativesdk-glibc-locale" | 70 | SDK_DEPENDS += "nativesdk-glibc-locale" |
71 | 71 | ||
72 | # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it | 72 | # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it |