MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

classes: switch p7zip to 7zip

Browse Source 
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.

(From OE-Core rev: 5aa516bfa295d5be919459dfe45f452cdec45e81)

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Marko 2025-02-05 18:51:18 +01:00 committed by Richard Purdie
parent f82bac5b5a
commit 39cbbd1a87
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes-global/base.bbclass
View File

@ -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)

2
meta/classes-recipe/image_types.bbclass
View File

@ -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"

2
meta/classes-recipe/populate_sdk_base.bbclass
View File

@ -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')