Review request
cover Review request
Please review these changes for hardknott. No issues seen on autobuilder.
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2689
Thanks,
Anuj
The following changes since commit 97d6a8452779fe511a354a70a72dd338f52a92cb:
bash: Ensure deterministic build (2021-09-29 16:22:10 +0800)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib anujm/hardknott
Alexander Kanavin (1):
wic: keep rootfs_size as integer
Anibal Limon (1):
recipes-support/ptest-runner: Bump to v2.4.2
Chandana kalluri (1):
scriptutils.py: Add check before deleting path
Chen Qi (1):
systemd: fix CVE-2021-33910
Jon Mason (1):
Update mailing list address
Kenfe-Mickael Laventure (1):
package_ipk: Use localdata store when signing packages
Richard Purdie (3):
bind: Exclude CVE-2019-6470 from cve-check
vim: Backport fix for CVE-2021-3770
glew: Stop polluting /tmp during builds
Sakib Sajal (1):
qemu: fix CVE-2021-3682
William A. Kennington III (1):
rm_work.bbclass: Fix for files starting with -
meta/classes/package_ipk.bbclass | 4 +-
meta/classes/rm_work.bbclass | 8 +-
meta/conf/distro/include/maintainers.inc | 2 +-
.../recipes-connectivity/bind/bind_9.16.16.bb | 4 +
.../ldconfig-native-2.12.1/ldconfig.patch | 2 +-
...it-name-do-not-use-strdupa-on-a-path.patch | 72 ++++++
meta/recipes-core/systemd/systemd_247.6.bb | 1 +
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2021-3682.patch | 41 ++++
.../glew/glew/notempdir.patch | 19 ++
meta/recipes-graphics/glew/glew_2.2.0.bb | 1 +
...-runner_2.4.1.bb => ptest-runner_2.4.2.bb} | 2 +-
...1e135a16091c93f6f5f7525a5c58fb7ca9f9.patch | 207 ++++++++++++++++++
meta/recipes-support/vim/vim.inc | 2 +
scripts/lib/scriptutils.py | 3 +-
scripts/lib/wic/partition.py | 2 +-
16 files changed, 360 insertions(+), 11 deletions(-)
create mode 100644 meta/recipes-core/systemd/systemd/0001-basic-unit-name-do-not-use-strdupa-on-a-path.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch
create mode 100644 meta/recipes-graphics/glew/glew/notempdir.patch
rename meta/recipes-support/ptest-runner/{ptest-runner_2.4.1.bb => ptest-runner_2.4.2.bb} (93%)
create mode 100644 meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patchSignature · 1 line
2.31.1
PATCH 1/11 systemd: fix CVE-2021-33910
From: Chen Qi <[email protected]>
Backport patch to fix CVE-2021-33910.
--- ...it-name-do-not-use-strdupa-on-a-path.patch | 72 +++++++++++++++++++ meta/recipes-core/systemd/systemd_247.6.bb | 1 + 2 files changed, 73 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-basic-unit-name-do-not-use-strdupa-on-a-path.patch
meta/recipes-core/systemd/systemd/0001-basic-unit-name-do-not-use-strdupa-on-a-path.patch new file +72 -0
@@ -0,0 +1,72 @@ +From b00674347337b7531c92fdb65590ab253bb57538 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]> +Date: Wed, 23 Jun 2021 11:46:41 +0200 +Subject: [PATCH] basic/unit-name: do not use strdupa() on a path + +The path may have unbounded length, for example through a fuse mount. + +CVE-2021-33910: attacked controlled alloca() leads to crash in systemd and +ultimately a kernel panic. Systemd parses the content of /proc/self/mountinfo +and each mountpoint is passed to mount_setup_unit(), which calls +unit_name_path_escape() underneath. A local attacker who is able to mount a +filesystem with a very long path can crash systemd and the whole system. + +https://bugzilla.redhat.com/show_bug.cgi?id=1970887 + +The resulting string length is bounded by UNIT_NAME_MAX, which is 256. But we +can't easily check the length after simplification before doing the +simplification, which in turns uses a copy of the string we can write to. +So we can't reject paths that are too long before doing the duplication. +Hence the most obvious solution is to switch back to strdup(), as before +7410616cd9dbbec97cf98d75324da5cda2b2f7a2. + +(cherry picked from commit 441e0115646d54f080e5c3bb0ba477c892861ab9) +(cherry picked from commit 764b74113e36ac5219a4b82a05f311b5a92136ce) +(cherry picked from commit 4a1c5f34bd3e1daed4490e9d97918e504d19733b) + +CVE: CVE-2021-33910 +Upstream-Status: Backport [b00674347337b7531c92fdb65590ab253bb57538] +Signed-off-by: Chen Qi <[email protected]> +--- + src/basic/unit-name.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c +index 5f595af944..9b6cacde87 100644 +--- a/src/basic/unit-name.c ++++ b/src/basic/unit-name.c +@@ -378,12 +378,13 @@ int unit_name_unescape(const char *f, char **ret) { + } + + int unit_name_path_escape(const char *f, char **ret) { +- char *p, *s; ++ _cleanup_free_ char *p = NULL; ++ char *s; + + assert(f); + assert(ret); + +- p = strdupa(f); ++ p = strdup(f); + if (!p) + return -ENOMEM; + +@@ -395,13 +396,9 @@ int unit_name_path_escape(const char *f, char **ret) { + if (!path_is_normalized(p)) + return -EINVAL; + +- /* Truncate trailing slashes */ ++ /* Truncate trailing slashes and skip leading slashes */ + delete_trailing_chars(p, "/"); +- +- /* Truncate leading slashes */ +- p = skip_leading_chars(p, "/"); +- +- s = unit_name_escape(p); ++ s = unit_name_escape(skip_leading_chars(p, "/")); + } + if (!s) + return -ENOMEM; +-- +2.33.0 +
meta/recipes-core/systemd/systemd_247.6.bb +1 -0
@@ -31,6 +31,7 @@ SRC_URI += "file://touchscreen.rules \ file://0002-sd-dhcp-client-shorten-code-a-bit.patch \ file://0003-sd-dhcp-client-logs-when-dhcp-client-unexpectedly-ga.patch \ file://0004-sd-dhcp-client-tentatively-ignore-FORCERENEW-command.patch \ + file://0001-basic-unit-name-do-not-use-strdupa-on-a-path.patch \ " # patches needed by musl
Signature · 1 line
2.31.1
PATCH 2/11 qemu: fix CVE-2021-3682
In reply to Anuj MittalFrom: Sakib Sajal <[email protected]>
--- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2021-3682.patch | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -69,6 +69,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3582.patch \ file://CVE-2021-3607.patch \ file://CVE-2021-3608.patch \ + file://CVE-2021-3682.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 3/11 bind: Exclude CVE-2019-6470 from cve-check
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
Issue only affects dhcpd with recent bind versions. We don't ship dhcpd anymore so the issue doesn't affect us.
--- meta/recipes-connectivity/bind/bind_9.16.16.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-connectivity/bind/bind_9.16.16.bb +4 -0
@@ -26,6 +26,10 @@ UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4 UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/" +# Issue only affects dhcpd with recent bind versions. We don't ship dhcpd anymore +# so the issue doesn't affect us. +CVE_CHECK_WHITELIST += "CVE-2019-6470" + inherit autotools update-rc.d systemd useradd pkgconfig multilib_header update-alternatives # PACKAGECONFIGs readline and libedit should NOT be set at same time
Signature · 1 line
2.31.1
PATCH 4/11 Update mailing list address
In reply to Anuj MittalFrom: Jon Mason <[email protected]>
--- meta/conf/distro/include/maintainers.inc | 2 +- meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/maintainers.inc +1 -1
@@ -4,7 +4,7 @@ # # Please submit any patches against recipes in meta to the # OE-Core mail list ([email protected]) -# For recipes in meta-yocto please use the Poky list ([email protected]) +# For recipes in meta-yocto please use the Poky list ([email protected]) # # If you have problems with or questions about a particular recipe, feel # free to contact the maintainer directly (cc:ing the appropriate mailing list
meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch +1 -1
@@ -400,7 +400,7 @@ Index: ldconfig-native-2.12.1/ldconfig.c return 0; } -+#define REPORT_BUGS_TO "mailing list : [email protected]" ++#define REPORT_BUGS_TO "mailing list : [email protected]" /* Print bug-reporting information in the help message. */ static char * more_help (int key, const char *text, void *input)
Signature · 1 line
2.31.1
PATCH 5/11 wic: keep rootfs_size as integer
In reply to Anuj MittalFrom: Alexander Kanavin <[email protected]>
The corrected line accidentally converted it to float, which causes problems later on with python 3.10:
| File "/home/alex/development/poky/scripts/lib/wic/partition.py", line 278, in prepare_rootfs_ext | os.ftruncate(sparse.fileno(), rootfs_size * 1024) | TypeError: 'float' object cannot be interpreted as an integer
--- scripts/lib/wic/partition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/partition.py +1 -1
@@ -104,7 +104,7 @@ class Partition(): extra_blocks = self.extra_space rootfs_size = actual_rootfs_size + extra_blocks - rootfs_size *= self.overhead_factor + rootfs_size = int(rootfs_size * self.overhead_factor) logger.debug("Added %d extra blocks to %s to get to %d total blocks", extra_blocks, self.mountpoint, rootfs_size)
Signature · 1 line
2.31.1
PATCH 6/11 vim: Backport fix for CVE-2021-3770
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
--- ...1e135a16091c93f6f5f7525a5c58fb7ca9f9.patch | 207 ++++++++++++++++++ meta/recipes-support/vim/vim.inc | 2 + 2 files changed, 209 insertions(+) create mode 100644 meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch
meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch new file +207 -0
@@ -0,0 +1,207 @@ +From b7081e135a16091c93f6f5f7525a5c58fb7ca9f9 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar <[email protected]> +Date: Sat, 4 Sep 2021 18:47:28 +0200 +Subject: [PATCH] patch 8.2.3402: invalid memory access when using :retab with + large value + +Problem: Invalid memory access when using :retab with large value. +Solution: Check the number is positive. + +CVE: CVE-2021-3770 +Signed-off-by: Richard Purdie <[email protected]> +Upstream-Status: Backport [https://github.com/vim/vim/commit/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9] +--- + src/indent.c | 34 +++++++++++++++++++++------------- + src/option.c | 12 ++++++------ + src/optionstr.c | 4 ++-- + src/testdir/test_retab.vim | 3 +++ + src/version.c | 2 ++ + 5 files changed, 34 insertions(+), 21 deletions(-) + +Index: git/src/indent.c +=================================================================== +--- git.orig/src/indent.c ++++ git/src/indent.c +@@ -18,18 +18,19 @@ + /* + * Set the integer values corresponding to the string setting of 'vartabstop'. + * "array" will be set, caller must free it if needed. ++ * Return FAIL for an error. + */ + int + tabstop_set(char_u *var, int **array) + { +- int valcount = 1; +- int t; +- char_u *cp; ++ int valcount = 1; ++ int t; ++ char_u *cp; + + if (var[0] == NUL || (var[0] == '0' && var[1] == NUL)) + { + *array = NULL; +- return TRUE; ++ return OK; + } + + for (cp = var; *cp != NUL; ++cp) +@@ -43,8 +44,8 @@ tabstop_set(char_u *var, int **array) + if (cp != end) + emsg(_(e_positive)); + else +- emsg(_(e_invarg)); +- return FALSE; ++ semsg(_(e_invarg2), cp); ++ return FAIL; + } + } + +@@ -55,26 +56,33 @@ tabstop_set(char_u *var, int **array) + ++valcount; + continue; + } +- emsg(_(e_invarg)); +- return FALSE; ++ semsg(_(e_invarg2), var); ++ return FAIL; + } + + *array = ALLOC_MULT(int, valcount + 1); + if (*array == NULL) +- return FALSE; ++ return FAIL; + (*array)[0] = valcount; + + t = 1; + for (cp = var; *cp != NUL;) + { +- (*array)[t++] = atoi((char *)cp); +- while (*cp != NUL && *cp != ',') ++ int n = atoi((char *)cp); ++ ++ if (n < 0 || n > 9999) ++ { ++ semsg(_(e_invarg2), cp); ++ return FAIL; ++ } ++ (*array)[t++] = n; ++ while (*cp != NUL && *cp != ',') + ++cp; + if (*cp != NUL) + ++cp; + } + +- return TRUE; ++ return OK; + } + + /* +@@ -1556,7 +1564,7 @@ ex_retab(exarg_T *eap) + + #ifdef FEAT_VARTABS + new_ts_str = eap->arg; +- if (!tabstop_set(eap->arg, &new_vts_array)) ++ if (tabstop_set(eap->arg, &new_vts_array) == FAIL) + return; + while (vim_isdigit(*(eap->arg)) || *(eap->arg) == ',') + ++(eap->arg); +Index: git/src/option.c +=================================================================== +--- git.orig/src/option.c ++++ git/src/option.c +@@ -2292,9 +2292,9 @@ didset_options2(void) + #endif + #ifdef FEAT_VARTABS + vim_free(curbuf->b_p_vsts_array); +- tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); ++ (void)tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); + vim_free(curbuf->b_p_vts_array); +- tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); ++ (void)tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); + #endif + } + +@@ -5756,7 +5756,7 @@ buf_copy_options(buf_T *buf, int flags) + buf->b_p_vsts = vim_strsave(p_vsts); + COPY_OPT_SCTX(buf, BV_VSTS); + if (p_vsts && p_vsts != empty_option) +- tabstop_set(p_vsts, &buf->b_p_vsts_array); ++ (void)tabstop_set(p_vsts, &buf->b_p_vsts_array); + else + buf->b_p_vsts_array = 0; + buf->b_p_vsts_nopaste = p_vsts_nopaste +@@ -5914,7 +5914,7 @@ buf_copy_options(buf_T *buf, int flags) + buf->b_p_isk = save_p_isk; + #ifdef FEAT_VARTABS + if (p_vts && p_vts != empty_option && !buf->b_p_vts_array) +- tabstop_set(p_vts, &buf->b_p_vts_array); ++ (void)tabstop_set(p_vts, &buf->b_p_vts_array); + else + buf->b_p_vts_array = NULL; + #endif +@@ -5929,7 +5929,7 @@ buf_copy_options(buf_T *buf, int flags) + buf->b_p_vts = vim_strsave(p_vts); + COPY_OPT_SCTX(buf, BV_VTS); + if (p_vts && p_vts != empty_option && !buf->b_p_vts_array) +- tabstop_set(p_vts, &buf->b_p_vts_array); ++ (void)tabstop_set(p_vts, &buf->b_p_vts_array); + else + buf->b_p_vts_array = NULL; + #endif +@@ -6634,7 +6634,7 @@ paste_option_changed(void) + if (buf->b_p_vsts_array) + vim_free(buf->b_p_vsts_array); + if (buf->b_p_vsts && buf->b_p_vsts != empty_option) +- tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array); ++ (void)tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array); + else + buf->b_p_vsts_array = 0; + #endif +Index: git/src/optionstr.c +=================================================================== +--- git.orig/src/optionstr.c ++++ git/src/optionstr.c +@@ -2166,7 +2166,7 @@ did_set_string_option( + if (errmsg == NULL) + { + int *oldarray = curbuf->b_p_vsts_array; +- if (tabstop_set(*varp, &(curbuf->b_p_vsts_array))) ++ if (tabstop_set(*varp, &(curbuf->b_p_vsts_array)) == OK) + { + if (oldarray) + vim_free(oldarray); +@@ -2205,7 +2205,7 @@ did_set_string_option( + { + int *oldarray = curbuf->b_p_vts_array; + +- if (tabstop_set(*varp, &(curbuf->b_p_vts_array))) ++ if (tabstop_set(*varp, &(curbuf->b_p_vts_array)) == OK) + { + vim_free(oldarray); + #ifdef FEAT_FOLDING +Index: git/src/testdir/test_retab.vim +=================================================================== +--- git.orig/src/testdir/test_retab.vim ++++ git/src/testdir/test_retab.vim +@@ -74,4 +74,7 @@ endfunc + func Test_retab_error() + call assert_fails('retab -1', 'E487:') + call assert_fails('retab! -1', 'E487:') ++ call assert_fails('ret -1000', 'E487:') ++ call assert_fails('ret 10000', 'E475:') ++ call assert_fails('ret 80000000000000000000', 'E475:') + endfunc +Index: git/src/version.c +=================================================================== +--- git.orig/src/version.c ++++ git/src/version.c +@@ -743,6 +743,8 @@ static char *(features[]) = + static int included_patches[] = + { /* Add new patch number below this line */ + /**/ ++ 3402, ++/**/ + 0 + }; +
meta/recipes-support/vim/vim.inc +2 -0
@@ -19,7 +19,9 @@ SRC_URI = "git://github.com/vim/vim.git \ file://racefix.patch \ file://CVE-2021-3778.patch \ file://CVE-2021-3796.patch \ + file://b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch \ " + SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" # Do not consider .z in x.y.z, as that is updated with every commit
Signature · 1 line
2.31.1
PATCH 7/11 glew: Stop polluting /tmp during builds
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
Currently the glew code creates a new directory in /tmp for each make invocation. This is a bit ugly, don't do that. The patch does break the dist targets but we don't use them.
--- .../glew/glew/notempdir.patch | 19 +++++++++++++++++++ meta/recipes-graphics/glew/glew_2.2.0.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-graphics/glew/glew/notempdir.patch
meta/recipes-graphics/glew/glew/notempdir.patch new file +19 -0
@@ -0,0 +1,19 @@ +We don't use the dist-* targets and hence DIST_DIR isn't used. The current code +creates a new temp directory in /tmp/ for every invocation of make. Lets +not do that. + +Upstream-Status: Pending [a revised version would be needed for upstream] +Signed-off-by: Richard Purdie <[email protected]> + +Index: glew-2.2.0/Makefile +=================================================================== +--- glew-2.2.0.orig/Makefile ++++ glew-2.2.0/Makefile +@@ -56,7 +56,6 @@ DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME + DIST_SRC_TGZ ?= $(shell pwd)/$(DIST_NAME).tgz + DIST_WIN32 ?= $(shell pwd)/$(DIST_NAME)-win32.zip + +-DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME) + + # To disable stripping of linked binaries either: + # - use STRIP= on gmake command-line
meta/recipes-graphics/glew/glew_2.2.0.bb +1 -0
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://0001-Fix-build-race-in-Makefile.patch \ + file://notempdir.patch \ file://no-strip.patch" SRC_URI[md5sum] = "3579164bccaef09e36c0af7f4fd5c7c7"
Signature · 1 line
2.31.1
PATCH 8/11 package_ipk: Use localdata store when signing packages
In reply to Anuj MittalFrom: Kenfe-Mickael Laventure <[email protected]>
When signing a package, we were resolving the PKGV version using the original data store (d). However, since that store does not have the package name in its OVERRIDES list the wrong version can be returned in recipes that produce multiple packages. One such example would be external-arm-toolchain.bb.
The above issue is fixed by using localdata instead of d when resolving the needed variables.
--- meta/classes/package_ipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/package_ipk.bbclass +2 -2
@@ -230,8 +230,8 @@ def ipk_write_pkg(pkg, d): shell=True) if d.getVar('IPK_SIGN_PACKAGES') == '1': - ipkver = "%s-%s" % (d.getVar('PKGV'), d.getVar('PKGR')) - ipk_to_sign = "%s/%s_%s_%s.ipk" % (pkgoutdir, pkgname, ipkver, d.getVar('PACKAGE_ARCH')) + ipkver = "%s-%s" % (localdata.getVar('PKGV'), localdata.getVar('PKGR')) + ipk_to_sign = "%s/%s_%s_%s.ipk" % (pkgoutdir, pkgname, ipkver, localdata.getVar('PACKAGE_ARCH')) sign_ipk(d, ipk_to_sign) finally:
Signature · 1 line
2.31.1
PATCH 9/11 rm_work.bbclass: Fix for files starting with -
In reply to Anuj MittalFrom: "William A. Kennington III" <[email protected]>
This makes it possible to name files starting with a hyphen in the work directory. Without this change rm will fail due to an unexpected option being passed.
--- meta/classes/rm_work.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes/rm_work.bbclass +4 -4
@@ -73,7 +73,7 @@ do_rm_work () { # sstate version since otherwise we'd need to leave 'plaindirs' around # such as 'packages' and 'packages-split' and these can be large. No end # of chain tasks depend directly on do_package anymore. - rm -f $i; + rm -f -- $i; ;; *_setscene*) # Skip stamps which are already setscene versions
@@ -90,7 +90,7 @@ do_rm_work () { ;; esac done - rm -f $i + rm -f -- $i esac done
@@ -100,9 +100,9 @@ do_rm_work () { # Retain only logs and other files in temp, safely ignore # failures of removing pseudo folers on NFS2/3 server. if [ $dir = 'pseudo' ]; then - rm -rf $dir 2> /dev/null || true + rm -rf -- $dir 2> /dev/null || true elif ! echo "$excludes" | grep -q -w "$dir"; then - rm -rf $dir + rm -rf -- $dir fi done }
Signature · 1 line
2.31.1
PATCH 10/11 recipes-support/ptest-runner: Bump to v2.4.2
In reply to Anuj MittalFrom: Anibal Limon <[email protected]>
Changes,
bcb8280 utils.c: add system data collection when a test gets stuck. c29240c utils.c: handle test timeouts directly with poll() d6f509f tests/utils.c: fix a memory corruption in find_word c10e747 main: Do not return number of failed tests when calling ptest-runner 4958988 utils.c: fix memory leak in run_ptests()
fcfa6a1 clang: clean-ups to avoid -Weverything warnings.
215e52d Makefile: allow using CC env var to pick compiler fdd233d mem: Simplify memory management
e5e218a mem: Fix memleak for ptest_opts
0dc42eb git: Extend the gitignore
---
.../{ptest-runner_2.4.1.bb => ptest-runner_2.4.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/ptest-runner/{ptest-runner_2.4.1.bb => ptest-runner_2.4.2.bb} (93%)meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb renamed from meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb +1 -1
@@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "cce0edb4282ee081d043030bfdf29f3e4052f86c" +SRCREV = "bcb82804daa8f725b6add259dcef2067e61a75aa" PV .= "+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \
Signature · 1 line
2.31.1
PATCH 11/11 scriptutils.py: Add check before deleting path
In reply to Anuj MittalFrom: Chandana kalluri <[email protected]>
Add a check before deleting path when using recipetool commands to avoid the following type of errors:
Traceback (most recent call last):
File "<workdir>/sources/core/scripts/lib/scriptutils.py", line 218, in fetch_url
shutil.rmtree(path)
File "/usr/local/lib/python3.7/shutil.py", line 476, in rmtree
onerror(os.lstat, path, sys.exc_info())
File "/usr/local/lib/python3.7/shutil.py", line 474, in rmtree
orig_st = os.lstat(path)
FileNotFoundError: [Errno 2] No such file or directory: '<workdir>/build/tmp/work/recipetool-usg7o81n/work/recipe-sysroot'
ERROR: Command 'script -e -q -c "recipetool --color=always create --devtool -o /tmp/devtool5sq_op37 'file:///<SRCTREE>' -x <workdir>/build/workspace/sources/devtoolsrcxc1b9zjq -N test" /dev/null' failed
--- scripts/lib/scriptutils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/lib/scriptutils.py +2 -1
@@ -215,7 +215,8 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger, preserve_tmp=False, mirr pathvars = ['T', 'RECIPE_SYSROOT', 'RECIPE_SYSROOT_NATIVE'] for pathvar in pathvars: path = rd.getVar(pathvar) - shutil.rmtree(path) + if os.path.exists(path): + shutil.rmtree(path) finally: if fetchrecipe: try:
Signature · 1 line
2.31.1