| Message ID | 20241222081612.239474-2-hongxu.jia@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,scarthgap,1/4] Use 7zip 24.09 to replace p7zip 16.02 | expand |
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb index e9b0c97e9..72d29e571 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ " -DEPENDS = "libbsd libpcre zlib libcap libusb squashfs-tools p7zip libselinux googletest" +DEPENDS = "libbsd libpcre zlib libcap libusb squashfs-tools 7zip libselinux googletest" SRCREV_core = "abfd66fafcbb691d7860df059f1df1c9b1ef29da" @@ -166,7 +166,7 @@ do_install() { PACKAGES =+ "${PN}-fstools ${PN}-adbd" -RDEPENDS:${BPN} = "${BPN}-conf p7zip" +RDEPENDS:${BPN} = "${BPN}-conf 7zip" FILES:${PN}-adbd = "\ ${bindir}/adbd \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 71f74287c..7af2af905 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -374,7 +374,7 @@ RDEPENDS:packagegroup-meta-oe-extended ="\ nana \ nicstat \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \ - p7zip \ + 7zip \ isomd5sum \ jpnevulator \ ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \ diff --git a/meta-python/recipes-devtools/python/python3-rarfile_4.2.bb b/meta-python/recipes-devtools/python/python3-rarfile_4.2.bb index 41cff4bfc..6f3012d1e 100644 --- a/meta-python/recipes-devtools/python/python3-rarfile_4.2.bb +++ b/meta-python/recipes-devtools/python/python3-rarfile_4.2.bb @@ -13,7 +13,7 @@ inherit pypi PYPI_PACKAGE="rarfile" RDEPENDS:${PN} += "\ - p7zip \ + 7zip \ python3-core \ python3-datetime \ python3-crypt \ diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb index abb5c14e6..4822f0cad 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb @@ -30,4 +30,4 @@ do_configure:prepend() { FILES:${PN} += "${libdir}/thunar-archive-plugin" -RRECOMMENDS:${PN} = "lzop zip tar bzip2 unzip xz p7zip" +RRECOMMENDS:${PN} = "lzop zip tar bzip2 unzip xz 7zip"
Due to commit [Use 7zip 2409 to replace p7zip 16.02] applied, update affected recipes (cherry picked from commit 751cc692ee13f0e7ba7a82d73dd4c987da3d578d) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- .../recipes-devtool/android-tools/android-tools_29.0.6.r14.bb | 4 ++-- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- meta-python/recipes-devtools/python/python3-rarfile_4.2.bb | 2 +- meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)