From: Peter Marko <[email protected]> meta-oe has switched from p7zip to 7zip. p7zip recipe does not exist anymore and p7zip is provided and rprovided by 7zip recipe. Use real provider instead of replaced one.
Signed-off-by: Peter Marko <[email protected]> --- meta/classes-global/base.bbclass | 4 ++-- meta/classes-recipe/image_types.bbclass | 2 +- meta/classes-recipe/populate_sdk_base.bbclass | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 988bdbcf0f..924f319999 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -645,9 +645,9 @@ python () { elif path.endswith('.deb'): d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot') - # *.7z should DEPEND on p7zip-native for unpacking + # *.7z should DEPEND on 7zip-native for unpacking elif path.endswith('.7z'): - d.appendVarFlag('do_unpack', 'depends', ' p7zip-native:do_populate_sysroot') + d.appendVarFlag('do_unpack', 'depends', ' 7zip-native:do_populate_sysroot') set_packagetriplet(d) diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 87d6effc6c..e6ef0ce11e 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -367,7 +367,7 @@ CONVERSION_DEPENDS_xz = "xz-native" CONVERSION_DEPENDS_lz4 = "lz4-native" CONVERSION_DEPENDS_lzo = "lzop-native" CONVERSION_DEPENDS_zip = "zip-native" -CONVERSION_DEPENDS_7zip = "p7zip-native" +CONVERSION_DEPENDS_7zip = "7zip-native" CONVERSION_DEPENDS_zst = "zstd-native" CONVERSION_DEPENDS_sum = "mtd-utils-native" CONVERSION_DEPENDS_bmap = "bmaptool-native" diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index 98ac723552..f111466b4c 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass @@ -94,7 +94,7 @@ python () { # recommand to cd into input dir first to avoid archive with buildpath d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDK_ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') elif d.getVar('SDK_ARCHIVE_TYPE') == '7zip': - d.setVar('SDK_ARCHIVE_DEPENDS', 'p7zip-native') + d.setVar('SDK_ARCHIVE_DEPENDS', '7zip-native') d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; 7za a -r ${SDK_7ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_7ZIP_TYPE} .') elif d.getVar('SDK_ARCHIVE_TYPE') == 'tar.zst': d.setVar('SDK_ARCHIVE_DEPENDS', 'zstd-native')
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#210871): https://lists.openembedded.org/g/openembedded-core/message/210871 Mute This Topic: https://lists.openembedded.org/mt/111017163/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
