Re: [PATCH 1/2] ltp-ddt: remove scheduler trace patch no longer required

From: Denys Dmytriyenko <denys@ti.com>
To: Carlos Hernandez <ceh@ti.com>
Cc: meta-arago@arago-project.org, yan-liu@ti.com
Subject: Re: [PATCH 1/2] ltp-ddt: remove scheduler trace patch no longer required
Date: Fri, 3 Mar 2017 14:05:44 -0500	[thread overview]
Message-ID: <20170303190544.GI12614@edge> (raw)
In-Reply-To: <1488551149-39460-1-git-send-email-ceh@ti.com>

This will break bisect-ability - since removing the patch either before or 
after the upgrade can cause breakage, the only way is to do it in the same 
commit as the upgrade itself. Sure, commits have to be as granular, as 
possible, but at the same time they should be atomic.

On Fri, Mar 03, 2017 at 09:25:48AM -0500, Carlos Hernandez wrote:
> Latest version of ltp fixes the problem and the patch
> 0029-trace_shed-Fix-build-with-musl.patch no longer applies.
> 
> Signed-off-by: Carlos Hernandez <ceh@ti.com>
> ---
>  .../0029-trace_shed-Fix-build-with-musl.patch      | 32 ----------------------
>  .../recipes-devtools/ltp-ddt/ltp-ddt_20160510.bb   |  3 +-
>  2 files changed, 1 insertion(+), 34 deletions(-)
>  delete mode 100644 meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0029-trace_shed-Fix-build-with-musl.patch
> 
> diff --git a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0029-trace_shed-Fix-build-with-musl.patch b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0029-trace_shed-Fix-build-with-musl.patch
> deleted file mode 100644
> index f7ece9e18ef0..000000000000
> --- a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0029-trace_shed-Fix-build-with-musl.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 2f8a57f66a94210d34dd0361659a8297cf3d813f Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 8 Jan 2016 07:29:24 +0000
> -Subject: [PATCH 29/32] trace_shed: Fix build with musl
> -
> -Errors on musl are
> -
> -trace_sched.c:425:16: error: invalid operands to binary & (have
> -'thread_sched_t * {aka struct <anonymous> *}' and 'int')
> -      thrd_ndx, WEXITSTATUS(status));
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - testcases/kernel/sched/tool/trace_sched.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/testcases/kernel/sched/tool/trace_sched.c b/testcases/kernel/sched/tool/trace_sched.c
> -index 7815686..30dca5f 100644
> ---- a/testcases/kernel/sched/tool/trace_sched.c
> -+++ b/testcases/kernel/sched/tool/trace_sched.c
> -@@ -422,7 +422,7 @@ int main(int argc,		/* number of input parameters.                        */
> - 			if (status == (thread_sched_t *) - 1) {
> - 				fprintf(stderr,
> - 					"thread [%d] - process exited with errors %d\n",
> --					thrd_ndx, WEXITSTATUS(status));
> -+					thrd_ndx, WEXITSTATUS((int)status));
> - 				exit(-1);
> - 			} else {
> - 				exp_prio[thrd_ndx] = status->exp_prio;
> --- 
> -2.7.0
> -
> diff --git a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20160510.bb b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20160510.bb
> index 22b962141dba..3bb17c8f8535 100644
> --- a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20160510.bb
> +++ b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20160510.bb
> @@ -17,8 +17,7 @@ inherit autotools-brokensep
>  SRCREV = "429d12779e28e1997f656db19c5bf73edf9e9365"
>  BRANCH ?= "master"
>  
> -SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \
> -    file://0029-trace_shed-Fix-build-with-musl.patch"
> +SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH}"
>  
>  S = "${WORKDIR}/git"
>  
> -- 
> 2.7.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago