mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

classes/populate_sdk_base: Fix SDK manifest generation

Browse Source 
The write_{host,target}_sdk_manifest don't need to be set as
SDK_POSTPROCESS_COMMAND because are already append to
POPULATE_SDK_POST_{HOST,TARGET}_COMMAND and the if doesn't
make sense because are only added for populate sdk task.

[YOCTO #11741]

(From OE-Core rev: b10ecbab3acd46e48d36910e30544e9f5f08d6d7)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón
2017-06-30 16:07:30 -05:00
committed by Richard Purdie
parent 1542de816c
commit 2d84c7a55d
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/populate_sdk_base.bbclass
+17 -19
View File
@@ -63,15 +63,14 @@ SDK_EXT_TARGET_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.target.manif
SDK_EXT_HOST_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.host.manifest" SDK_EXT_HOST_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.host.manifest"
python write_target_sdk_manifest () { python write_target_sdk_manifest () {
if d.getVar('BB_CURRENTTASK') == 'populate_sdk': from oe.sdk import sdk_list_installed_packages
from oe.sdk import sdk_list_installed_packages from oe.utils import format_pkg_list
from oe.utils import format_pkg_list sdkmanifestdir = os.path.dirname(d.getVar("SDK_TARGET_MANIFEST"))
sdkmanifestdir = os.path.dirname(d.getVar("SDK_TARGET_MANIFEST")) pkgs = sdk_list_installed_packages(d, True)
pkgs = sdk_list_installed_packages(d, True) if not os.path.exists(sdkmanifestdir):
if not os.path.exists(sdkmanifestdir): bb.utils.mkdirhier(sdkmanifestdir)
bb.utils.mkdirhier(sdkmanifestdir) with open(d.getVar('SDK_TARGET_MANIFEST'), 'w') as output:
with open(d.getVar('SDK_TARGET_MANIFEST'), 'w') as output: output.write(format_pkg_list(pkgs, 'ver'))
output.write(format_pkg_list(pkgs, 'ver'))
} }
python write_sdk_test_data() { python write_sdk_test_data() {
@@ -82,22 +81,21 @@ python write_sdk_test_data() {
} }
python write_host_sdk_manifest () { python write_host_sdk_manifest () {
if d.getVar('BB_CURRENTTASK') == 'populate_sdk': from oe.sdk import sdk_list_installed_packages
from oe.sdk import sdk_list_installed_packages from oe.utils import format_pkg_list
from oe.utils import format_pkg_list sdkmanifestdir = os.path.dirname(d.getVar("SDK_HOST_MANIFEST"))
sdkmanifestdir = os.path.dirname(d.getVar("SDK_HOST_MANIFEST")) pkgs = sdk_list_installed_packages(d, False)
pkgs = sdk_list_installed_packages(d, False) if not os.path.exists(sdkmanifestdir):
if not os.path.exists(sdkmanifestdir): bb.utils.mkdirhier(sdkmanifestdir)
bb.utils.mkdirhier(sdkmanifestdir) with open(d.getVar('SDK_HOST_MANIFEST'), 'w') as output:
with open(d.getVar('SDK_HOST_MANIFEST'), 'w') as output: output.write(format_pkg_list(pkgs, 'ver'))
output.write(format_pkg_list(pkgs, 'ver'))
} }
POPULATE_SDK_POST_TARGET_COMMAND_append = " write_sdk_test_data ; " POPULATE_SDK_POST_TARGET_COMMAND_append = " write_sdk_test_data ; "
POPULATE_SDK_POST_TARGET_COMMAND_append_task-populate-sdk = " write_target_sdk_manifest ; " POPULATE_SDK_POST_TARGET_COMMAND_append_task-populate-sdk = " write_target_sdk_manifest ; "
POPULATE_SDK_POST_HOST_COMMAND_append_task-populate-sdk = " write_host_sdk_manifest; " POPULATE_SDK_POST_HOST_COMMAND_append_task-populate-sdk = " write_host_sdk_manifest; "
SDK_PACKAGING_COMMAND = "${@'${SDK_PACKAGING_FUNC};' if '${SDK_PACKAGING_FUNC}' else ''}" SDK_PACKAGING_COMMAND = "${@'${SDK_PACKAGING_FUNC};' if '${SDK_PACKAGING_FUNC}' else ''}"
SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; tar_sdk; write_target_sdk_manifest; write_host_sdk_manifest; ${SDK_PACKAGING_COMMAND} " SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; tar_sdk; ${SDK_PACKAGING_COMMAND} "
def populate_sdk_common(d): def populate_sdk_common(d):
from oe.sdk import populate_sdk from oe.sdk import populate_sdk