diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 946a1d479b..de72e32ed8 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -88,25 +88,8 @@ fakeroot python do_populate_sdk() { | |||
88 | 88 | ||
89 | populate_sdk(d) | 89 | populate_sdk(d) |
90 | 90 | ||
91 | # Handle multilibs in the SDK environment, siteconfig, etc files... | ||
92 | localdata = bb.data.createCopy(d) | ||
93 | |||
94 | # make sure we only use the WORKDIR value from 'd', or it can change | ||
95 | localdata.setVar('WORKDIR', d.getVar('WORKDIR', True)) | ||
96 | |||
97 | # make sure we only use the SDKTARGETSYSROOT value from 'd' | ||
98 | localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True)) | ||
99 | |||
100 | # Process DEFAULTTUNE | 91 | # Process DEFAULTTUNE |
101 | bb.build.exec_func("create_sdk_files", localdata) | 92 | bb.build.exec_func("create_sdk_files", d) |
102 | |||
103 | variants = d.getVar("MULTILIB_VARIANTS", True) or "" | ||
104 | for item in variants.split(): | ||
105 | # Load overrides from 'd' to avoid having to reset the value... | ||
106 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | ||
107 | localdata.setVar("OVERRIDES", overrides) | ||
108 | bb.data.update_data(localdata) | ||
109 | bb.build.exec_func("create_sdk_files", localdata) | ||
110 | 93 | ||
111 | bb.build.exec_func("tar_sdk", d) | 94 | bb.build.exec_func("tar_sdk", d) |
112 | 95 | ||
@@ -114,14 +97,6 @@ fakeroot python do_populate_sdk() { | |||
114 | } | 97 | } |
115 | 98 | ||
116 | fakeroot create_sdk_files() { | 99 | fakeroot create_sdk_files() { |
117 | # Setup site file for external use | ||
118 | toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} | ||
119 | |||
120 | toolchain_create_sdk_env_script ${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} | ||
121 | |||
122 | # Add version information | ||
123 | toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS} | ||
124 | |||
125 | cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ | 100 | cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ |
126 | 101 | ||
127 | # Replace the ##DEFAULT_INSTALL_DIR## with the correct pattern. | 102 | # Replace the ##DEFAULT_INSTALL_DIR## with the correct pattern. |