From fa172a9bc1459c1737da3f0ba92dc6ff5eaf14fe Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Wed, 8 Dec 2021 17:27:38 +0100
Subject: [PATCH] ptest-runner: Drop 2.4.0 patch as later versions have the
argv issue fixed
oe-core comes with version 2.4.2 which has the issue fixed. We can now
safely drop the patch.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
...test-runner-fix-incorrect-allocation.patch | 22 -------------------
...ner-fix-incorrect-allocation.patch.license | 2 --
.../ptest-runner/ptest-runner_2.4.0.bbappend | 5 -----
3 files changed, 29 deletions(-)
delete mode 100644 meta-oniro-core/recipes-support/ptest-runner/ptest-runner/ptest-runner-fix-incorrect-allocation.patch
delete mode 100644 meta-oniro-core/recipes-support/ptest-runner/ptest-runner/ptest-runner-fix-incorrect-allocation.patch.license
delete mode 100644 meta-oniro-core/recipes-support/ptest-runner/ptest-runner_2.4.0.bbappend
diff --git a/meta-oniro-core/recipes-support/ptest-runner/ptest-runner/ptest-runner-fix-incorrect-allocation.patch b/meta-oniro-core/recipes-support/ptest-runner/ptest-runner/ptest-runner-fix-incorrect-allocation.patch
deleted file mode 100644
index 872a8faa..00000000
--- a/meta-oniro-core/recipes-support/ptest-runner/ptest-runner/ptest-runner-fix-incorrect-allocation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bernhard.rosenkraenzer.ext@huawei.com Thu Sep 2 10:54:01 2021
-From: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
-Date: Thu, 2 Sep 2021 10:54:01 +0100
-Subject: [PATCH] Fix bogus allocation
-
-argv needs to hold 2 character pointers, not just 2 characters.
-
-Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
-Upstream-Status: Inappropriate [fixed differently upstream]
-
-diff -up git/utils.c.omv~ git/utils.c
---- git/utils.c.omv~ 2021-09-02 10:18:46.061467114 +0200
-+++ git/utils.c 2021-09-02 10:21:13.011651255 +0200
-@@ -268,7 +268,7 @@ close_fds(void)
- static inline void
- run_child(char *run_ptest, int fd_stdout, int fd_stderr)
- {
-- char **argv = malloc(sizeof(char) * 2);
-+ char **argv = malloc(sizeof(char*) * 2);
- chdir(dirname(strdup(run_ptest)));
-
- argv[0] = run_ptest;
diff --git a/meta-oniro-core/recipes-support/ptest-runner/ptest-runner/ptest-runner-fix-incorrect-allocation.patch.license b/meta-oniro-core/recipes-support/ptest-runner/ptest-runner/ptest-runner-fix-incorrect-allocation.patch.license
deleted file mode 100644
index 2a2d9f5d..00000000
--- a/meta-oniro-core/recipes-support/ptest-runner/ptest-runner/ptest-runner-fix-incorrect-allocation.patch.license
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-# SPDX-License-Identifier: Apache-2.0
diff --git a/meta-oniro-core/recipes-support/ptest-runner/ptest-runner_2.4.0.bbappend b/meta-oniro-core/recipes-support/ptest-runner/ptest-runner_2.4.0.bbappend
deleted file mode 100644
index 09b7059f..00000000
--- a/meta-oniro-core/recipes-support/ptest-runner/ptest-runner_2.4.0.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " file://ptest-runner-fix-incorrect-allocation.patch"
--
GitLab