diff --git a/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend b/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..65cb5f6b6f8fecd9796ed005f238f0f7de50f773 --- /dev/null +++ b/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend @@ -0,0 +1,37 @@ +# main bbfile: yocto-poky/meta/recipes-core/coreutils/coreutils_8.32.bb + +# version in openEuler +PV = "9.0" + +# solve lic check failed +LIC_FILES_CHKSUM_remove = " \ + file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \ +" +LIC_FILES_CHKSUM += " \ + file://src/ls.c;beginline=1;endline=15;md5=3b8fbaee597c8a9bb88d30840d53048c \ +" + +# files, patches can't be applied in openeuler or conflict with openeuler +SRC_URI_remove = " \ + ${GNU_MIRROR}/coreutils/${BP}.tar.xz \ + file://fix-selinux-flask.patch \ + file://0001-uname-report-processor-and-hardware-correctly.patch \ + file://disable-ls-output-quoting.patch \ + file://0001-ls-restore-8.31-behavior-on-removed-directories.patch \ +" + +# files, patches that come from openeuler +SRC_URI_prepend = " \ + file://${BP}.tar.xz;name=tarball \ + file://0001-disable-test-of-rwlock.patch \ + file://backport-timeout-ensure-foreground-k-exits-with-status-137.patch \ + file://skip-the-tests-that-require-selinux-if-selinux-is-di.patch \ + file://backport-chmod-fix-exit-status-when-ignoring-symlinks.patch \ + file://bugfix-dummy_help2man.patch \ + file://coreutils-8.2-uname-processortype.patch \ + file://backport-config-color-alias-for-ls.patch \ + file://coreutils-getgrouplist.patch \ +" + +SRC_URI[tarball.md5sum] = "0d79ae8a6124546e3b94171375e5e5d0" +SRC_URI[tarball.sha256sum] = "ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce" diff --git a/meta-openeuler/recipes-extended/findutils/findutils_%.bbappend b/meta-openeuler/recipes-extended/findutils/findutils_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..f3de2d6aff525e53a229d29ff57bbe0b9fd18001 --- /dev/null +++ b/meta-openeuler/recipes-extended/findutils/findutils_%.bbappend @@ -0,0 +1,7 @@ +# main bbfile: yocto-poky/meta/recipes-extended/findutils/findutils_4.8.0.bb + +# files, patches that come from openeuler +SRC_URI += " \ + file://0001-findutils-leaf-opt.patch \ + file://0001-findutils-xautofs.patch \ +" diff --git a/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend b/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..58718d76c39e01ffc17c52fa281dd9d113595a2d --- /dev/null +++ b/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend @@ -0,0 +1,20 @@ +# main bbfile: yocto-poky/meta/recipes-extended/gawk/gawk_5.1.0.bb + +# version in openEuler +PV = "5.1.1" + +# files, patches can't be applied in openeuler or conflict with openeuler +SRC_URI_remove = " \ + ${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ +" + +# files, patches that come from openeuler +# Reorder-statements-in-iolint-to-try-to-eliminate-a-r.patch fails to apply +SRC_URI += " \ + file://${BP}.tar.xz;name=tarball \ + file://Disable-racy-test-in-test-iolint.awk.patch \ + file://Restore-removed-test-in-test-iolint.awk.patch \ +" + +SRC_URI[tarball.md5sum] = "83650aa943ff2fd519b2abedf8506ace" +SRC_URI[tarball.sha256sum] = "d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2" diff --git a/meta-openeuler/recipes-extended/logrotate/logrotate_%.bbappend b/meta-openeuler/recipes-extended/logrotate/logrotate_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..f21ee7a70ae41c221404074632fe25607f52fa67 --- /dev/null +++ b/meta-openeuler/recipes-extended/logrotate/logrotate_%.bbappend @@ -0,0 +1,18 @@ +# main bbfile: yocto-poky/meta/recipes-extended/logrotate/logrotate_3.18.0.bb + +# version in openEuler +PV = "3.20.1" + +# files, patches can't be applied in openeuler or conflict with openeuler +SRC_URI_remove = " \ + https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ +" + +# files, patches that come from openeuler +SRC_URI += " \ + file://${BPN}/${BP}.tar.xz;name=tarball \ + file://${BPN}/0001-logrotate-3.20.1-lock-state-msg.patch \ +" + +SRC_URI[tarball.md5sum] = "24704642e1e6c7889edbe2b639636caf" +SRC_URI[tarball.sha256sum] = "742f6d6e18eceffa49a4bacd933686d3e42931cfccfb694d7f6369b704e5d094" diff --git a/meta-openeuler/recipes-extended/shadow/shadow-securetty_%.bbappend b/meta-openeuler/recipes-extended/shadow/shadow-securetty_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..61355946fc61688328aa186501c671c535d89057 --- /dev/null +++ b/meta-openeuler/recipes-extended/shadow/shadow-securetty_%.bbappend @@ -0,0 +1,2 @@ +PV = "4.8.1" +PR = "r1" diff --git a/meta-openeuler/recipes-extended/shadow/shadow-sysroot_%.bbappend b/meta-openeuler/recipes-extended/shadow/shadow-sysroot_%.bbappend index e611d625c210cbe4c71912570b99f32cec8c24ec..aa024ec5d02076ff33ef5bf8e14f72ccbf2a9614 100644 --- a/meta-openeuler/recipes-extended/shadow/shadow-sysroot_%.bbappend +++ b/meta-openeuler/recipes-extended/shadow/shadow-sysroot_%.bbappend @@ -1,4 +1,5 @@ -PV = "4.7" +PV = "4.8.1" +PR = "r1" # no base-passwd now in openeuler DEPENDS_remove += "base-passwd" diff --git a/meta-openeuler/recipes-support/curl/curl_%.bbappend b/meta-openeuler/recipes-support/curl/curl_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..f94f1c4c635654e5e585c5ab945aa239eb263020 --- /dev/null +++ b/meta-openeuler/recipes-support/curl/curl_%.bbappend @@ -0,0 +1,29 @@ +# main bbfile: yocto-poky/meta/recipes-support/curl/curl_7.75.0.bb + +# version in openEuler +PV = "7.79.1" + +# files, patches can't be applied in openeuler or conflict with openeuler +SRC_URI_remove = " \ + https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://0001-vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch \ + file://0002-transfer-strip-credentials-from-the-auto-referer-hea.patch \ + file://vtls-fix-addsessionid.patch \ + file://vtls-fix-warning.patch \ + file://CVE-2021-22898.patch \ + file://CVE-2021-22897.patch \ +" + +# files, patches that come from openeuler +# do not apply backport-0101-curl-7.32.0-multilib.patch due to failure "libcurl.pc failed sanity test" when doing QA staging "pkg-config libcurl" in this patch +SRC_URI += " \ + file://curl/${BP}.tar.xz;name=tarball \ +" + +SRC_URI[tarball.md5sum] = "74d3c4ca8aaa6c0619806d6e246e65fb" +SRC_URI[tarball.sha256sum] = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689" + +# configure.ac in openEuler can't handle --without-libmetalink variable +EXTRA_OECONF_remove = " \ + --without-libmetalink \ +" diff --git a/meta-openeuler/recipes-support/popt/popt_%.bbappend b/meta-openeuler/recipes-support/popt/popt_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..5257ca8d7decb83d2702384ec5035eacabff380d --- /dev/null +++ b/meta-openeuler/recipes-support/popt/popt_%.bbappend @@ -0,0 +1,9 @@ +# main bbfile: yocto-poky/meta/recipes-support/popt/popt_1.18.bb + +# files, patches that come from openeuler +SRC_URI += " \ + file://popt/fix-coverity-CID-1057440-Unused-pointer-value-UNUSED.patch \ + file://popt/fix-handle-newly-added-asset-.-call-like-elsewhere.patch \ + file://popt/fix-obscure-iconv-mis-call-error-path-could-lead-to-.patch \ + file://popt/fix-permit-reading-aliases-remove-left-over-goto-exi.patch \ +"