From 4e0710b576616b9b662a9717aca4967c056e744a Mon Sep 17 00:00:00 2001 From: saarloos <9090-90-90-9090@163.com> Date: Thu, 10 Nov 2022 11:05:54 +0800 Subject: [PATCH] meta: change download 2209 to master change download 2209 to master Signed-off-by: saarloos <9090-90-90-9090@163.com> --- .../bind/bind-dhclient_%.bbappend | 8 +-- .../recipes-connectivity/dhcp/dhcp_%.bbappend | 15 +++-- meta-openeuler/recipes-core/lvm2/lvm2.inc | 30 ++++----- .../lvm2/{lvm2_2.03.14.bb => lvm2_2.03.16.bb} | 0 meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb | 65 +++++-------------- .../e2fsprogs/e2fsprogs_%.bbappend | 36 +++++----- .../libtool/libtool-cross_%.bbappend | 7 +- .../recipes-devtools/tcltk/tcl_%.bbappend | 3 + .../cracklib/cracklib_%.bbappend | 16 ++--- .../recipes-extended/libaio/libaio_%.bbappend | 8 ++- .../libidn2/libidn2_%.bbappend | 10 +-- .../recipes-extended/procps/procps_%.bbappend | 20 +++--- .../recipes-extended/shadow/shadow_%.bbappend | 2 - .../libatomic-ops/libatomic-ops_%.bbappend | 8 +-- .../recipes-support/libnl/libnl_%.bbappend | 21 +++--- .../libunistring/libunistring_%.bbappend | 6 +- scripts/compile.sh | 2 +- scripts/download_code.sh | 18 ++--- 18 files changed, 122 insertions(+), 153 deletions(-) rename meta-openeuler/recipes-core/lvm2/{lvm2_2.03.14.bb => lvm2_2.03.16.bb} (100%) diff --git a/meta-openeuler/recipes-connectivity/bind/bind-dhclient_%.bbappend b/meta-openeuler/recipes-connectivity/bind/bind-dhclient_%.bbappend index 382ea0b91e4..83b2c5ac219 100644 --- a/meta-openeuler/recipes-connectivity/bind/bind-dhclient_%.bbappend +++ b/meta-openeuler/recipes-connectivity/bind/bind-dhclient_%.bbappend @@ -12,9 +12,7 @@ SRC_URI_remove = "https://ftp.isc.org/isc/bind9/${PV}/${PACKAGE_FETCH_NAME}-${PV OPENEULER_REPO_NAME = "dhcp" # integrate the patch of a later version, apply openEuler/dhcp patch adapt -SRC_URI_prepend = "file://dhcp-4.4.2.tar.gz;name=dhcp.tarball \ - file://backport-0025-bind-Detect-system-time-changes.patch \ - file://0001-revert-d10fbdec-for-lib-dns-gen.c-as-it-is-a-build-p.patch \ +SRC_URI_prepend = "file://dhcp-4.4.3.tar.gz;name=dhcp.tarball \ " SRC_URI[dhcp.tarball.sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" @@ -23,10 +21,10 @@ SRC_URI[dhcp.tarball.sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe2 USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ --shell /sbin/nologin --user-group bind" -# decompress the source code from dhcp-4.4.2.tar.gz +# decompress the source code from dhcp-4.4.3.tar.gz do_unpack_bind () { cd ${WORKDIR} - tar -xf dhcp-4.4.2/bind/bind.tar.gz + tar -xf dhcp-4.4.3/bind/bind.tar.gz } addtask unpack_bind after do_unpack before do_patch diff --git a/meta-openeuler/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-openeuler/recipes-connectivity/dhcp/dhcp_%.bbappend index 9128b19862a..2cbb222093b 100644 --- a/meta-openeuler/recipes-connectivity/dhcp/dhcp_%.bbappend +++ b/meta-openeuler/recipes-connectivity/dhcp/dhcp_%.bbappend @@ -1,7 +1,7 @@ # source bb: meta-overc/recipes-connectivity/dhcp/dhcp_4.4.2-P1.bb # version in openEuler -PV = "4.4.2" +PV = "4.4.3" # apply patches in openEuler SRC_URI_prepend = "file://backport-0001-change-bug-url.patch \ @@ -28,6 +28,7 @@ SRC_URI_prepend = "file://backport-0001-change-bug-url.patch \ file://backport-0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch \ file://backport-0023-option-97-pxe-client-id.patch \ file://backport-0024-Detect-system-time-changes.patch \ + file://backport-0025-bind-Detect-system-time-changes.patch \ file://backport-0026-Add-dhclient-5-B-option-description.patch \ file://backport-0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch \ file://bugfix-dhcp-4.2.5-check-dhclient-pid.patch \ @@ -36,20 +37,20 @@ SRC_URI_prepend = "file://backport-0001-change-bug-url.patch \ file://dhcpd-coredump-infiniband.patch \ file://bugfix-dhclient-check-if-pid-was-held.patch \ file://bugfix-dhcp-64-bit-lease-parse.patch \ - file://backport-CVE-2021-25217.patch \ - file://fix-multiple-definition-with-gcc-10-1.patch \ - file://fix-multiple-definition-with-gcc-10-2.patch \ file://fix-coredump-when-client-active-is-NULL.patch \ - file://bugfix-error-message-display.patch \ file://feature-lease-time-config-ipv6.patch \ file://add-a-test-case-to-parse-code93-in-option_unittest.patch \ + file://bugfix-error-message-display.patch \ + file://backport-Fix-CVE-2021-25220.patch \ + file://backport-Fix-CVE-2022-2928.patch \ + file://backport-Fix-CVE-2022-2929.patch \ " SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1" -# it will make a error when using dhclient -# because backport-0007-Change-paths-to-conform-to-our-standards.patch +# it will make a error when using dhclient +# because backport-0007-Change-paths-to-conform-to-our-standards.patch # changed the path /sbin/dhclient-script to /usr/sbin/dhclient-script for dhclient finding dhclient-script # so re-install the dhclient-script to fix it. do_install_append() { diff --git a/meta-openeuler/recipes-core/lvm2/lvm2.inc b/meta-openeuler/recipes-core/lvm2/lvm2.inc index 31f7b35aff4..1f28a796b82 100644 --- a/meta-openeuler/recipes-core/lvm2/lvm2.inc +++ b/meta-openeuler/recipes-core/lvm2/lvm2.inc @@ -5,25 +5,23 @@ LICENSE = "GPLv2 & LGPLv2.1 & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ - file://COPYING.BSD;md5=d7e19e89ea9f54c1af1aa83c7b7122e7 \ + file://COPYING.BSD;md5=d7e19e89ea9f54c1af1aa83c7b7122e7 \ " SRC_URI = "file://lvm2/LVM2.${PV}.tgz \ - file://lvm2/0001-lvm2-set-default-preferred_names.patch \ - file://lvm2/0002-lvm2-default-allow-changes-with-duplicate-pvs.patch \ - file://lvm2/0003-devs-check-for-no-dev-when-dropping-aliases.patch \ - file://lvm2/0004-bugfix-lvm2-add-SSD.patch \ - file://lvm2/0005-bugfix-add-timeout-when-fail-to-wait-udev.patch \ - file://lvm2/0006-bugfix-fix-the-code-maybe-lead-to-buffer-over-bound-access.patch \ - file://lvm2/0007-enhancement-modify-default-log-level-to-error-level.patch \ - file://lvm2/0008-enhancement-add-dfx-log.patch \ - file://lvm2/0009-enhancement-syslog-more-when-use-libdevmapper-so.patch \ - file://lvm2/0010-enhancement-log-it-when-disk-slow.patch \ - file://lvm2/0011-bugfix-lvm2-fix-the-reuse-of-va_list.patch \ - file://lvm2/0012-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch \ - file://lvm2/0013-dev_name-determine-whether-the-dev-aliases-linked-li.patch \ - file://lvm2/0014-lvm-code-reduce-cyclomatic-complexity.patch \ - file://lvm2/0015-_vg_read_raw_area-fix-segfault-caused-by-using-null-.patch \ + file://0001-lvm2-set-default-preferred_names.patch \ + file://0002-lvm2-default-allow-changes-with-duplicate-pvs.patch \ + file://0003-bugfix-lvm2-add-SSD.patch \ + file://0004-bugfix-add-timeout-when-fail-to-wait-udev.patch \ + file://0005-bugfix-fix-the-code-maybe-lead-to-buffer-over-bound-access.patch \ + file://0006-enhancement-modify-default-log-level-to-error-level.patch \ + file://0007-enhancement-add-dfx-log.patch \ + file://0008-enhancement-syslog-more-when-use-libdevmapper-so.patch \ + file://0009-enhancement-log-it-when-disk-slow.patch \ + file://0010-bugfix-lvm2-fix-the-reuse-of-va_list.patch \ + file://0011-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch \ + file://0012-lvm-code-reduce-cyclomatic-complexity.patch \ + file://0013-_vg_read_raw_area-fix-segfault-caused-by-using-null-.patch \ " SRC_URI[sha256sum] = "4a63bc8a084a8ae3c7bc5e6530cac264139d218575c64416c8b99e3fe039a05c" diff --git a/meta-openeuler/recipes-core/lvm2/lvm2_2.03.14.bb b/meta-openeuler/recipes-core/lvm2/lvm2_2.03.16.bb similarity index 100% rename from meta-openeuler/recipes-core/lvm2/lvm2_2.03.14.bb rename to meta-openeuler/recipes-core/lvm2/lvm2_2.03.16.bb diff --git a/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb b/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb index e25f8b9999b..d01325eca9d 100644 --- a/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb +++ b/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb @@ -6,59 +6,28 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://${BP}.tar.gz \ - file://0001-huawei-adapt-to-huawei-4.0.3.patch \ - file://0002-add-mount-label-for-rootfs.patch \ - file://0003-format-code-and-verify-mount-mode.patch \ - file://0004-Removes-the-definition-of-the-thread-attributes-obje.patch \ - file://0005-solve-coredump-bug-caused-by-fstype-being-NULL-durin.patch \ - file://0006-SIGTERM-do-not-catch-signal-SIGTERM-in-lxc-monitor.patch \ - file://0007-Using-string-type-instead-of-security_context_t-beca.patch \ - file://0008-hook-pass-correct-mount-dir-as-root-to-hook.patch \ - file://0009-cgroup-refact-cgroup-manager-to-single-file.patch \ - file://0010-cgfsng-adjust-log-level-from-error-to-warn.patch \ - file://0011-rootfs-add-make-private-for-root.path-parent.patch \ - file://0012-mount-make-possible-to-bind-mount-proc-and-sys-fs.patch \ - file://0013-use-path-based-unix-domain-sockets-instead-of-abstra.patch \ - file://0014-api-add-get-container-metrics-api.patch \ - file://0015-Streaming-IO-solution-optimization-and-enhancement.patch \ - file://0016-avoid-using-void-pointers-in-caclulation.patch \ - file://0017-fix-compilation-errors-without-libcap.patch \ - file://0018-IO-fix-io-data-miss-when-exec-with-pipes.patch \ - file://0019-metrics-add-total_inactive_file-metric-for-memory.patch \ - file://0020-support-cgroup-v2.patch \ - file://0021-support-isula-exec-workdir.patch \ - file://0022-print-error-message-if-process-workdir-failed.patch \ - file://0023-log-support-long-syslog-tag.patch \ - file://0024-log-adjust-log-level-from-error-to-warn.patch \ - file://0025-get-cgroup-data-len-first-and-malloc-read-buff-by-le.patch \ - file://0026-coredump-fix-coredump-when-cgroup-get-return-error.patch \ - file://0027-add-help-for-new-arguments.patch \ - file://0028-seccomp-init-and-destroy-notifier.cookie.patch \ - file://0029-just-use-origin-loop-if-do-not-have-io.patch \ - file://0030-conf-fix-a-memory-leak.patch \ - file://0031-fix-lsm_se_mount_context-memory-leak.patch \ - file://0032-disable-lxc_keep-with-oci-image.patch \ - file://0033-conf-ensure-that-the-idmap-pointer-itself-is-freed.patch \ - file://0034-cgfsng-fix-cgroup-attach-cgroup-creation.patch \ - file://0035-adapt-upstream-compiler-settings.patch \ - file://0036-compile-in-android-env.patch \ - file://0037-fix-always-print-and-temp-len.patch \ - file://0038-just-print-error-when-new-lock-failed.patch \ - file://0039-fix-bug-of-memory-free.patch \ - file://0041-do-not-free-the-pointer-returned-by-dirname.patch \ - file://0042-add-x-permission-when-create-directory.patch \ - file://0043-do-not-operate-playload-and-attach-cgroup-if-no-cont.patch \ - file://0044-fix-HOME-env-unset-error.patch \ - file://0045-only-set-user-or-image-set-non-empty-HOME.patch \ - file://0046-return-fail-if-no-args-or-no-rootfs-path-found.patch \ - file://0047-fix-tools-with-option-give-error-message.patch \ - file://0048-fix-do-mask-paths-after-parent-mounted.patch \ + file://0001-refactor-patch-code-of-utils-commands-and-so-on.patch \ + file://0002-refactor-patch-code-of-isulad-for-conf-exec-attach.patch \ + file://0003-refactor-patch-code-of-isulad-for-selinux-attach.patch \ + file://0004-refactor-patch-code-of-lxccontianer-and-so-on.patch \ + file://0005-refactor-patch-code-of-attach-and-seccomp.patch \ + file://0006-refactor-patch-about-namespace-log-terminal.patch \ + file://0007-refactor-patches-on-terminal.c-start.c-and-so-on.patch \ + file://0008-refactor-patch-code-of-json.patch \ + file://0009-fix-HOME-env-of-container-unset-error.patch \ + file://0010-check-yajl-only-when-have-isulad.patch \ + file://0011-drop-security_context_t.patch \ + file://0012-only-set-user-or-image-set-non-empty-HOME.patch \ + file://0013-return-fail-if-no-args-or-no-rootfs-path-found.patch \ + file://0014-fix-tools-using-option-give-error-message.patch \ + file://0015-fix-do-mask-pathes-after-parent-mounted.patch \ + file://0016-skip-kill-cgroup-processes-if-no-hierarchies.patch \ + file://0017-lxc-Add-sw64-architecture.patch \ " SRC_URI_append = " \ file://check_only_rootfs_as_filesystem_type.patch \ file://support_arm32.patch \ - file://0036-add-riscv-support.patch \ " DEPENDS = "yajl libseccomp libcap" diff --git a/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend b/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend index bff9c5d2473..3325f052e55 100644 --- a/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend +++ b/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend @@ -1,4 +1,4 @@ -PV = "1.46.4" +PV = "1.46.5" S = "${WORKDIR}/${BPN}-${PV}" # delete package from poky SRC_URI_remove += "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git \ @@ -6,27 +6,25 @@ SRC_URI_remove += "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git \ file://0001-e2fsck-fix-last-mount-write-time-when-e2fsck-is-forc.patch \ " -SRC_URI[sha256sum] = "b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713" +SRC_URI[sha256sum] = "2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e" # add openeuler patches SRC_URI += " \ file://e2fsprogs-${PV}.tar.xz \ file://0001-e2fsprogs-set-hugefile-from-4T-to-1T-in-hugefile-tes.patch \ - file://0002-libss-add-newer-libreadline.so.8-to-dlopen-path.patch \ - file://0003-tests-update-expect-files-for-f_mmp_garbage.patch \ - file://0004-tests-update-expect-files-for-f_large_dir-and-f_larg.patch \ - file://0005-resize2fs-resize2fs-disk-hardlinks-will-be-error.patch \ - file://0006-e2fsck-exit-journal-recovery-when-find-EIO-ENOMEM-er.patch \ - file://0007-e2fsck-exit-journal-recovery-when-jounral-superblock.patch \ - file://0008-e2fsck-add-env-param-E2FS_UNRELIABLE_IO-to-fi.patch \ - file://0009-e2mmpstatus.8.in-detele-filesystem-can-be-UUID-or-LA.patch \ - file://0010-tests-update-expect-file-for-u_direct_io.patch \ - file://0011-libext2fs-don-t-old-the-CACHE_MTX-while-doing-I-O.patch \ - file://0012-tests-fix-ACL-printing-tests.patch \ - file://0013-e2fsck-do-not-clean-up-file-acl-if-the-inode-is-trun.patch \ - file://0014-e2fsck-handle-level-is-overflow-in-ext2fs_extent_get.patch \ - file://0015-libext2fs-add-sanity-check-to-extent-manipulation.patch \ - file://0016-e2fsprogs-add-sw64.patch \ - file://0017-tune2fs-do-not-change-j_tail_sequence-in-journal-sup.patch \ - file://0018-debugfs-teach-logdump-the-n-num_trans-option.patch \ + file://0002-resize2fs-resize2fs-disk-hardlinks-will-be-error.patch \ + file://0003-e2fsck-exit-journal-recovery-when-find-EIO-ENOMEM-er.patch \ + file://0004-e2fsck-exit-journal-recovery-when-jounral-superblock.patch \ + file://0005-e2fsck-add-env-param-E2FS_UNRELIABLE_IO-to-fi.patch \ + file://0006-e2mmpstatus.8.in-detele-filesystem-can-be-UUID-or-LA.patch \ + file://0007-tests-fix-ACL-printing-tests.patch \ + file://0008-e2fsck-do-not-clean-up-file-acl-if-the-inode-is-trun.patch \ + file://0009-e2fsck-handle-level-is-overflow-in-ext2fs_extent_get.patch \ + file://0010-libext2fs-add-sanity-check-to-extent-manipulation.patch \ + file://0011-e2fsprogs-add-sw64.patch \ + file://0012-tune2fs-do-not-change-j_tail_sequence-in-journal-sup.patch \ + file://0013-debugfs-teach-logdump-the-n-num_trans-option.patch \ + file://0014-tune2fs-fix-tune2fs-segfault-when-ext2fs_run_ext3_jo.patch \ + file://0015-tune2fs-tune2fs_main-should-return-rc-when-some-erro.patch \ + file://0016-tune2fs-exit-directly-when-fs-freed-in-ext2fs_run_ext3_journal.patch \ " diff --git a/meta-openeuler/recipes-devtools/libtool/libtool-cross_%.bbappend b/meta-openeuler/recipes-devtools/libtool/libtool-cross_%.bbappend index 60899f2b35e..072101aef24 100644 --- a/meta-openeuler/recipes-devtools/libtool/libtool-cross_%.bbappend +++ b/meta-openeuler/recipes-devtools/libtool/libtool-cross_%.bbappend @@ -1,13 +1,14 @@ # main bbfile: yocto-poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb +PV = "2.4.7" SRC_URI_remove = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ + file://rename-with-sysroot.patch \ + file://fix-resolve-lt-sysroot.patch \ + file://unwind-opt-parsing.patch \ " # apply openeuler source package and patches SRC_URI_prepend = " \ file://libtool-${PV}.tar.xz \ file://libtool-2.4.5-rpath.patch \ - file://libtool-2.4.6-am-1.16-test.patch \ - file://libtool-exit-verbosely-for-fatal-configure-problems.patch \ - file://libtool-fix-GCC-linking-with-specs.patch \ " diff --git a/meta-openeuler/recipes-devtools/tcltk/tcl_%.bbappend b/meta-openeuler/recipes-devtools/tcltk/tcl_%.bbappend index 14df73d9d29..11cfe55cfb8 100644 --- a/meta-openeuler/recipes-devtools/tcltk/tcl_%.bbappend +++ b/meta-openeuler/recipes-devtools/tcltk/tcl_%.bbappend @@ -7,6 +7,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" BASE_SRC_URI_remove = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ " +SRC_URI_remove = "file://fix_non_native_build_issue.patch \ + file://no_packages.patch \ +" # source code package name has been changed BASE_SRC_URI =+ "file://${BPN}-core${PV}-src.tar.gz \ diff --git a/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend b/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend index 15b4f0a61a6..8a48fff8364 100644 --- a/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend +++ b/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend @@ -1,19 +1,19 @@ -PV = "2.9.7" +PV = "2.9.8" # get new 0001-packlib.c-support-dictionary-byte-order-dependent.patch from higher poky FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" # delete lower version patch from poky -SRC_URI_remove += " \ - file://0001-Apply-patch-to-fix-CVE-2016-6318.patch \ +SRC_URI_remove += "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ + file://0001-Apply-patch-to-fix-CVE-2016-6318.patch \ " # add openeuler patches -SRC_URI =+ " \ - file://fix-problem-of-error-message-about-simplistic-passwo.patch \ - file://backport-cracklib-2.9.6-lookup.patch \ - file://fix-error-length-about-simplistic-password.patch \ - file://fix-truncating-dict-file-without-input-data.patch \ +SRC_URI =+ "file://cracklib-${PV}.tar.gz \ + file://fix-problem-of-error-message-about-simplistic-passwo.patch \ + file://backport-cracklib-2.9.6-lookup.patch \ + file://fix-error-length-about-simplistic-password.patch \ + file://fix-truncating-dict-file-without-input-data.patch \ " SRC_URI[md5sum] = "48a0c8810ec4780b99c0a4f9931c21c6" diff --git a/meta-openeuler/recipes-extended/libaio/libaio_%.bbappend b/meta-openeuler/recipes-extended/libaio/libaio_%.bbappend index 67b74a745f5..bbb84d71274 100644 --- a/meta-openeuler/recipes-extended/libaio/libaio_%.bbappend +++ b/meta-openeuler/recipes-extended/libaio/libaio_%.bbappend @@ -1,14 +1,18 @@ +PV = "0.3.113" + #apply package and patches from openeuler SRC_URI = " \ - file://libaio-0.3.112.tar.gz \ + file://${BP}.tar.gz \ file://0000-libaio-install-to-destdir-slash-usr.patch \ file://0001-libaio-arm64-ilp32.patch \ file://0002-libaio-makefile-cflags.patch \ file://0003-libaio-fix-for-x32.patch \ file://0004-libaio-makefile-add-D_FORTIFY_SOURCE-flag.patch \ + file://0005-Fix-compile-error-that-exec-checking-need-super-priv.patch \ + file://0006-skip-testcase-23-since-current-kernel-version-not-su.patch \ " -SRC_URI[sha256sum] = "ab0462f2c9d546683e5147b1ce9c195fe95d07fac5bf362f6c01637955c3b492" +SRC_URI[sha256sum] = "2c44d1c5fd0d43752287c9ae1eb9c023f04ef848ea8d4aafa46e9aedb678200b" S = "${WORKDIR}/${BPN}-${PV}" diff --git a/meta-openeuler/recipes-extended/libidn2/libidn2_%.bbappend b/meta-openeuler/recipes-extended/libidn2/libidn2_%.bbappend index 905f7cb5286..03d02b7badc 100644 --- a/meta-openeuler/recipes-extended/libidn2/libidn2_%.bbappend +++ b/meta-openeuler/recipes-extended/libidn2/libidn2_%.bbappend @@ -1,7 +1,7 @@ # main bbfile: yocto-poky/meta/recipes-extended/libidn/libidn2_2.3.0.bb # version in openEuler -PV = "2.3.2" +PV = "2.3.3" # solve lic check failed LIC_FILES_CHKSUM_remove = " \ @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM_remove = " \ file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f \ " LIC_FILES_CHKSUM += " \ - file://src/idn2.c;endline=16;md5=e4b6d628a84a55f1fd8ae4c76c5f6509 \ - file://lib/idn2.h.in;endline=27;md5=d0fc8ec628be130a1d5b889107e92477 \ + file://src/idn2.c;endline=16;md5=0f347a5b17acf44440bf53e406f1df70 \ + file://lib/idn2.h.in;endline=27;md5=4d7b3771faa9c60067ed1da914508bc5 \ " # files, patches can't be applied in openeuler or conflict with openeuler @@ -24,5 +24,5 @@ SRC_URI += " \ file://bugfix-libidn2-change-rpath.patch \ " -SRC_URI[tarball.md5sum] = "fb54962eb68cf22d47a4ae61f0aba993" -SRC_URI[tarball.sha256sum] = "76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91" +SRC_URI[tarball.md5sum] = "82c0739df7ad818c70953453fb9c626d" +SRC_URI[tarball.sha256sum] = "f3ac987522c00d33d44b323cae424e2cffcb4c63c6aa6cd1376edacbf1c36eb0" diff --git a/meta-openeuler/recipes-extended/procps/procps_%.bbappend b/meta-openeuler/recipes-extended/procps/procps_%.bbappend index 959bd28d0fd..203343d1330 100644 --- a/meta-openeuler/recipes-extended/procps/procps_%.bbappend +++ b/meta-openeuler/recipes-extended/procps/procps_%.bbappend @@ -1,27 +1,27 @@ #main bbfile: yocto-poky/meta/recipes-extended/procps/procps_3.3.17.bb #version in openEuler -PV = "3.3.17" +PV = "4.0.0" -S = "${WORKDIR}/${BPN}-${PV}" +S = "${WORKDIR}/${BPN}-ng-${PV}" FILESEXTRAPATHS_append := "${THISDIR}/procps/:" -OPENEULER_REPO_NAME = "procps-ng" +OPENEULER_REPO_NAME = "${BPN}-ng" # files, patches can't be applied in openeuler or conflict with openeuler SRC_URI_remove = " \ git://gitlab.com/procps-ng/procps.git;protocol=https \ git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ + file://0001-w.c-correct-musl-builds.patch \ + file://0002-proc-escape.c-add-missing-include.patch \ " # files, patches that come from openeuler SRC_URI += " \ file://procps-ng/procps-ng-${PV}.tar.xz \ - file://procps-ng/0001-top-fix-two-potential-alternate-display-mode-abends.patch \ - file://procps-ng/0002-top-In-the-bye_bye-function-replace-fputs-with-the-w.patch \ - file://procps-ng/0003-add-options-M-and-N-for-top.patch \ - file://procps-ng/0004-top-exit-with-error-when-pid-overflow.patch \ - file://procps-ng/0005-fix-a-fix-for-the-bye_bye-function.patch \ + file://procps-ng/0001-add-M-and-N-options-for-top.patch \ + file://procps-ng/0002-top-exit-with-error-when-pid-overflow.patch \ + file://procps-ng/0003-top-eliminate-a-potential-abend-when-exiting-A-mode.patch \ " do_configure_prepend() { @@ -32,5 +32,5 @@ do_configure_prepend() { fi } -SRC_URI[tarball.md5sum] = "d60613e88c2f442ebd462b5a75313d56" -SRC_URI[tarball.sha256sum] = "4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4" +SRC_URI[tarball.md5sum] = "eedf93f2f6083afb7abf72188018e1e5" +SRC_URI[tarball.sha256sum] = "0f4d92794edb7a1c95bb3b8c1f823de62be5d0043459c2155fd07fa859c16513" diff --git a/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend b/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend index d46a7871463..4fbc30abff1 100644 --- a/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend +++ b/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend @@ -12,8 +12,6 @@ SRC_URI = "file://${BP}.tar.xz \ file://shadow-4.8-long-entry.patch \ file://usermod-unlock.patch \ file://useradd-create-directories-after-the-SELinux-user.patch \ - file://shadow-4.1.5.1-var-lock.patch \ - file://shadow-utils-fix-lock-file-residue.patch \ file://Makefile-include-libeconf-dependency-in-new-idmap.patch \ file://usermod-allow-all-group-types-with-G-option.patch \ file://useradd-avoid-generating-an-empty-subid-range.patch \ diff --git a/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend b/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend index 33681865a10..49796eca932 100644 --- a/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend +++ b/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend @@ -1,12 +1,12 @@ # main bbfile: yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb -PV = "7.6.12" +PV = "7.6.14" OPENEULER_REPO_NAME = "libatomic_ops" # apply src and patch from openEuler SRC_URI = "file://libatomic_ops-${PV}.tar.gz \ - file://libatomic_ops-${PV}-sw.patch \ + file://libatomic_ops-7.6.12-sw.patch \ " -SRC_URI[md5sum] = "0b0b88da4bde5dd770daea3146e78359" -SRC_URI[sha256sum] = "f0ab566e25fce08b560e1feab6a3db01db4a38e5bc687804334ef3920c549f3e" +SRC_URI[md5sum] = "ee8251f5091b7938d18be4dda843a515" +SRC_URI[sha256sum] = "390f244d424714735b7050d056567615b3b8f29008a663c262fb548f1802d292" diff --git a/meta-openeuler/recipes-support/libnl/libnl_%.bbappend b/meta-openeuler/recipes-support/libnl/libnl_%.bbappend index eb3793287f3..80a659eab36 100644 --- a/meta-openeuler/recipes-support/libnl/libnl_%.bbappend +++ b/meta-openeuler/recipes-support/libnl/libnl_%.bbappend @@ -1,14 +1,11 @@ +PV = "3.7.0" + OPENEULER_REPO_NAME = "libnl3" -SRC_URI += " \ - file://backport-lib-add-include-netlink-private-nl-auto-h-header.patch \ - file://backport-lib-use-proper-int-type-for-id-attributes-in-nl_object_identical.patch \ - file://backport-route-link-add-RTNL_LINK_REASM_OVERLAPS-stat.patch \ - file://backport-route-link-Check-for-null-pointer-in-macvlan.patch \ - file://backport-rtnl-link-fix-leaking-rtnl_link_af_ops-in-link_msg_parser.patch \ - file://backport-rtnl-route-fix-NLE_NOMEM-handling-in-parse_multipath.patch \ - file://solve-redefinition-of-struct-ipv6_mreq.patch \ - file://add-a-test-test-add-route.patch \ - file://add-some-tests-about-addr-class-rule-neigh-qdisc.patch \ - file://backport-fix-setting-ce_mask-when-parsing-VF-stat-counter.patch \ - file://backport-allow-constructing-all-zero-addresses.patch \ + +SRC_URI_remove += "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ " + +SRC_URI += "file://${BP}.tar.gz;name=tarball" + +SRC_URI[tarball.md5sum] = "b381405afd14e466e35d29a112480333" +SRC_URI[tarball.sha256sum] = "9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939" \ No newline at end of file diff --git a/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend b/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend index 8638b35abdb..804a3f27536 100644 --- a/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend +++ b/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend @@ -1,8 +1,10 @@ # main bbfile: yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.10.bb +PV = "1.1" # files, patches can't be applied in openeuler or conflict with openeuler SRC_URI_remove = " \ ${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " # files, patches that come from openeuler @@ -10,5 +12,5 @@ SRC_URI += " \ file://${BP}.tar.xz;name=tarball \ " -SRC_URI[tarball.md5sum] = "db08bb384e81968957f997ec9808926e" -SRC_URI[tarball.sha256sum] = "eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7" +SRC_URI[tarball.md5sum] = "0dfba19989ae06b8e7a49a7cd18472a1" +SRC_URI[tarball.sha256sum] = "827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98" diff --git a/scripts/compile.sh b/scripts/compile.sh index 612872d5f6a..4fd85106b39 100644 --- a/scripts/compile.sh +++ b/scripts/compile.sh @@ -157,7 +157,7 @@ download_pre_repo() main() { KERNEL_BRANCH="5.10.0-106.18.0" - SRC_BRANCH="openEuler-22.09" + SRC_BRANCH="master" GIT_PRE="https://gitee.com" GIT_SPACE="src-openeuler" download_pre_repo diff --git a/scripts/download_code.sh b/scripts/download_code.sh index e13158c27fd..8c64d9eb77e 100644 --- a/scripts/download_code.sh +++ b/scripts/download_code.sh @@ -117,9 +117,9 @@ download_code() update_code_repo src-openeuler/busybox ${SRC_BRANCH} update_code_repo openeuler/dsoftbus_standard v3.1 update_code_repo src-openeuler/libboundscheck ${SRC_BRANCH} - update_code_repo openeuler/yocto-embedded-tools master + update_code_repo openeuler/yocto-embedded-tools ${SRC_BRANCH} update_code_repo openeuler/embedded-ipc master - update_code_repo openeuler/yocto-poky ${SRC_BRANCH} + update_code_repo openeuler/yocto-poky openEuler-22.09 update_code_repo src-openeuler/yocto-pseudo ${SRC_BRANCH} update_code_repo openeuler/yocto-meta-openembedded dev_hardknott update_code_repo openeuler/yocto-meta-ros dev_hardknott @@ -127,7 +127,7 @@ download_code() update_code_repo src-openeuler/cracklib ${SRC_BRANCH} update_code_repo src-openeuler/libcap-ng ${SRC_BRANCH} update_code_repo src-openeuler/libpwquality ${SRC_BRANCH} - update_code_repo src-openeuler/openssh ${SRC_BRANCH} + update_code_repo src-openeuler/openssh ${SRC_BRANCH} update_code_repo src-openeuler/libnsl2 ${SRC_BRANCH} update_code_repo src-openeuler/openssl ${SRC_BRANCH} update_code_repo src-openeuler/pam ${SRC_BRANCH} @@ -149,7 +149,7 @@ download_code() update_code_repo src-openeuler/expat ${SRC_BRANCH} update_code_repo src-openeuler/acl ${SRC_BRANCH} update_code_repo src-openeuler/attr ${SRC_BRANCH} - update_code_repo src-openeuler/readline ${SRC_BRANCH} + update_code_repo src-openeuler/readline ${SRC_BRANCH} update_code_repo src-openeuler/libaio ${SRC_BRANCH} update_code_repo src-openeuler/libffi ${SRC_BRANCH} update_code_repo src-openeuler/popt ${SRC_BRANCH} @@ -159,7 +159,7 @@ download_code() update_code_repo src-openeuler/psmisc ${SRC_BRANCH} update_code_repo src-openeuler/squashfs-tools ${SRC_BRANCH} update_code_repo src-openeuler/strace ${SRC_BRANCH} - update_code_repo src-openeuler/util-linux ${SRC_BRANCH} + update_code_repo src-openeuler/util-linux ${SRC_BRANCH} update_code_repo src-openeuler/libsepol ${SRC_BRANCH} update_code_repo src-openeuler/libselinux ${SRC_BRANCH} update_code_repo src-openeuler/libsemanage ${SRC_BRANCH} @@ -177,7 +177,7 @@ download_code() update_code_repo src-openeuler/dhcp ${SRC_BRANCH} update_code_repo src-openeuler/libhugetlbfs ${SRC_BRANCH} update_code_repo src-openeuler/libnl3 ${SRC_BRANCH} - update_code_repo src-openeuler/libpcap ${SRC_BRANCH} + update_code_repo src-openeuler/libpcap ${SRC_BRANCH} update_code_repo src-openeuler/nfs-utils ${SRC_BRANCH} update_code_repo src-openeuler/rpcbind ${SRC_BRANCH} update_code_repo src-openeuler/cronie ${SRC_BRANCH} @@ -189,7 +189,7 @@ download_code() update_code_repo src-openeuler/pciutils ${SRC_BRANCH} update_code_repo src-openeuler/procps-ng ${SRC_BRANCH} update_code_repo src-openeuler/tzdata ${SRC_BRANCH} - update_code_repo src-openeuler/glib2 ${SRC_BRANCH} + update_code_repo src-openeuler/glib2 ${SRC_BRANCH} update_code_repo src-openeuler/raspberrypi-firmware ${SRC_BRANCH} update_code_repo src-openeuler/gmp ${SRC_BRANCH} update_code_repo src-openeuler/gdb ${SRC_BRANCH} @@ -198,7 +198,7 @@ download_code() update_code_repo src-openeuler/sysfsutils ${SRC_BRANCH} update_code_repo src-openeuler/tcl ${SRC_BRANCH} update_code_repo src-openeuler/expect ${SRC_BRANCH} - update_code_repo src-openeuler/jitterentropy-library ${SRC_BRANCH} + update_code_repo src-openeuler/jitterentropy-library ${SRC_BRANCH} update_code_repo src-openeuler/m4 ${SRC_BRANCH} update_code_repo src-openeuler/gdbm ${SRC_BRANCH} update_code_repo src-openeuler/libtool ${SRC_BRANCH} @@ -326,7 +326,7 @@ main() if [ -z "${SRC_BRANCH}" ];then # the latest release branch - SRC_BRANCH="openEuler-22.09" + SRC_BRANCH="master" fi [ -z "${KERNEL_BRANCH}" ] && KERNEL_BRANCH="${SRC_BRANCH}" -- Gitee