diff mbox series

[6/6] package/optee-benchmark: remove deprecated package

Message ID 20230502154713.1490788-6-etienne.carriere@linaro.org
State Accepted
Headers show
Series [1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark | expand

Commit Message

Etienne Carriere May 2, 2023, 3:47 p.m. UTC 
Removes package optee-benchmark that is no more maintained as
pointed by discussion thread [1].

Link: [1] https://github.com/OP-TEE/optee_os/issues/5909
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 package/Config.in                            |  1 -
 package/optee-benchmark/Config.in            | 20 --------------------
 package/optee-benchmark/optee-benchmark.hash |  4 ----
 package/optee-benchmark/optee-benchmark.mk   | 14 --------------
 4 files changed, 39 deletions(-)
 delete mode 100644 package/optee-benchmark/Config.in
 delete mode 100644 package/optee-benchmark/optee-benchmark.hash
 delete mode 100644 package/optee-benchmark/optee-benchmark.mk

Comments

Yann E. MORIN May 7, 2023, 9:38 p.m. UTC | #1 
Etienne, All,

On 2023-05-02 17:47 +0200, Etienne Carriere spake thusly:
> Removes package optee-benchmark that is no more maintained as
> pointed by discussion thread [1].

This needs to be moved to Config.in.legacy, to inform users that used to
use optee-benchmark that they can't use it anymore.

Applied to master with the ab ove entry added, thanks.

And now when I write this, I notice I forgot to amend the commit before
I pushed, so I did a separate commit. Dang...

Regards,
Yann E. MORIN.

> Link: [1] https://github.com/OP-TEE/optee_os/issues/5909
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
>  package/Config.in                            |  1 -
>  package/optee-benchmark/Config.in            | 20 --------------------
>  package/optee-benchmark/optee-benchmark.hash |  4 ----
>  package/optee-benchmark/optee-benchmark.mk   | 14 --------------
>  4 files changed, 39 deletions(-)
>  delete mode 100644 package/optee-benchmark/Config.in
>  delete mode 100644 package/optee-benchmark/optee-benchmark.hash
>  delete mode 100644 package/optee-benchmark/optee-benchmark.mk
> 
> diff --git a/package/Config.in b/package/Config.in
> index eaac32a01a..53c2d3b077 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -2565,7 +2565,6 @@ menu "Security"
>  	source "package/apparmor/Config.in"
>  	source "package/checkpolicy/Config.in"
>  	source "package/ima-evm-utils/Config.in"
> -	source "package/optee-benchmark/Config.in"
>  	source "package/optee-client/Config.in"
>  	source "package/optee-examples/Config.in"
>  	source "package/optee-test/Config.in"
> diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
> deleted file mode 100644
> index 2070582fbb..0000000000
> --- a/package/optee-benchmark/Config.in
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -config BR2_PACKAGE_OPTEE_BENCHMARK
> -	bool "optee-benchmark"
> -	depends on BR2_USE_MMU # fork()
> -	depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
> -	depends on !BR2_STATIC_LIBS # optee-client
> -	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client
> -	select BR2_PACKAGE_OPTEE_CLIENT
> -	select BR2_PACKAGE_LIBYAML
> -	help
> -	  Enable the OP-TEE benchmark package that brings facilities
> -	  for profiling traversal and execution timings when
> -	  invoking OP-TEE. OP-TEE benchmark is a component delivered
> -	  by the OP-TEE project.
> -
> -	  http://github.com/linaro-swg/optee_benchmark
> -
> -comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3"
> -	depends on BR2_USE_MMU
> -	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
> -		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
> diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
> deleted file mode 100644
> index d74a24c8ab..0000000000
> --- a/package/optee-benchmark/optee-benchmark.hash
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# From https://github.com/linaro-swg/optee_benchmark/archive/3.19.0/optee-benchmark-3.19.0.tar.gz
> -sha256  32f41854bf07eb7bb89dfc702da023c3a99518c33fbe7edf0e1f004e29a8c90c  optee-benchmark-3.19.0.tar.gz
> -# Locally computed
> -sha256  0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383  LICENSE
> diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
> deleted file mode 100644
> index 338a51ada4..0000000000
> --- a/package/optee-benchmark/optee-benchmark.mk
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -################################################################################
> -#
> -# optee-benchmark
> -#
> -################################################################################
> -
> -OPTEE_BENCHMARK_VERSION = 3.19.0
> -OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION))
> -OPTEE_BENCHMARK_LICENSE = BSD-2-Clause
> -OPTEE_BENCHMARK_LICENSE_FILES = LICENSE
> -
> -OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml
> -
> -$(eval $(cmake-package))
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Etienne Carriere May 9, 2023, 7:17 a.m. UTC | #2 
Hello Yann,

On Sun, 7 May 2023 at 23:38, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Etienne, All,
>
> On 2023-05-02 17:47 +0200, Etienne Carriere spake thusly:
> > Removes package optee-benchmark that is no more maintained as
> > pointed by discussion thread [1].
>
> This needs to be moved to Config.in.legacy, to inform users that used to
> use optee-benchmark that they can't use it anymore.
>
> Applied to master with the ab ove entry added, thanks.
>
> And now when I write this, I notice I forgot to amend the commit before
> I pushed, so I did a separate commit. Dang...

Thanks fixing the changes from my series..
I didn't even noticed patch files were listed .checkpacakgeignore.
I'll (try to) take care of that in the future.

br,
etienne

>
> Regards,
> Yann E. MORIN.
>
> > Link: [1] https://github.com/OP-TEE/optee_os/issues/5909
> > Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> > ---
> >  package/Config.in                            |  1 -
> >  package/optee-benchmark/Config.in            | 20 --------------------
> >  package/optee-benchmark/optee-benchmark.hash |  4 ----
> >  package/optee-benchmark/optee-benchmark.mk   | 14 --------------
> >  4 files changed, 39 deletions(-)
> >  delete mode 100644 package/optee-benchmark/Config.in
> >  delete mode 100644 package/optee-benchmark/optee-benchmark.hash
> >  delete mode 100644 package/optee-benchmark/optee-benchmark.mk
> >
> > diff --git a/package/Config.in b/package/Config.in
> > index eaac32a01a..53c2d3b077 100644
> > --- a/package/Config.in
> > +++ b/package/Config.in
> > @@ -2565,7 +2565,6 @@ menu "Security"
> >       source "package/apparmor/Config.in"
> >       source "package/checkpolicy/Config.in"
> >       source "package/ima-evm-utils/Config.in"
> > -     source "package/optee-benchmark/Config.in"
> >       source "package/optee-client/Config.in"
> >       source "package/optee-examples/Config.in"
> >       source "package/optee-test/Config.in"
> > diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
> > deleted file mode 100644
> > index 2070582fbb..0000000000
> > --- a/package/optee-benchmark/Config.in
> > +++ /dev/null
> > @@ -1,20 +0,0 @@
> > -config BR2_PACKAGE_OPTEE_BENCHMARK
> > -     bool "optee-benchmark"
> > -     depends on BR2_USE_MMU # fork()
> > -     depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
> > -     depends on !BR2_STATIC_LIBS # optee-client
> > -     depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client
> > -     select BR2_PACKAGE_OPTEE_CLIENT
> > -     select BR2_PACKAGE_LIBYAML
> > -     help
> > -       Enable the OP-TEE benchmark package that brings facilities
> > -       for profiling traversal and execution timings when
> > -       invoking OP-TEE. OP-TEE benchmark is a component delivered
> > -       by the OP-TEE project.
> > -
> > -       http://github.com/linaro-swg/optee_benchmark
> > -
> > -comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3"
> > -     depends on BR2_USE_MMU
> > -     depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
> > -             !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
> > diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
> > deleted file mode 100644
> > index d74a24c8ab..0000000000
> > --- a/package/optee-benchmark/optee-benchmark.hash
> > +++ /dev/null
> > @@ -1,4 +0,0 @@
> > -# From https://github.com/linaro-swg/optee_benchmark/archive/3.19.0/optee-benchmark-3.19.0.tar.gz
> > -sha256  32f41854bf07eb7bb89dfc702da023c3a99518c33fbe7edf0e1f004e29a8c90c  optee-benchmark-3.19.0.tar.gz
> > -# Locally computed
> > -sha256  0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383  LICENSE
> > diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
> > deleted file mode 100644
> > index 338a51ada4..0000000000
> > --- a/package/optee-benchmark/optee-benchmark.mk
> > +++ /dev/null
> > @@ -1,14 +0,0 @@
> > -################################################################################
> > -#
> > -# optee-benchmark
> > -#
> > -################################################################################
> > -
> > -OPTEE_BENCHMARK_VERSION = 3.19.0
> > -OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION))
> > -OPTEE_BENCHMARK_LICENSE = BSD-2-Clause
> > -OPTEE_BENCHMARK_LICENSE_FILES = LICENSE
> > -
> > -OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml
> > -
> > -$(eval $(cmake-package))
> > --
> > 2.25.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
Yann E. MORIN May 9, 2023, 3:44 p.m. UTC | #3 
Etienne, All,

On 2023-05-09 09:17 +0200, Etienne Carriere spake thusly:
> I didn't even noticed patch files were listed .checkpacakgeignore.

That's relatively recent, and the tooling does not yet catches this
issue; see:
    https://patchwork.ozlabs.org/project/buildroot/patch/20230506212531.365446-1-yann.morin.1998@free.fr/

Regards,
Yann E. MORIN.
diff mbox series

Patch

diff --git a/package/Config.in b/package/Config.in
index eaac32a01a..53c2d3b077 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2565,7 +2565,6 @@  menu "Security"
 	source "package/apparmor/Config.in"
 	source "package/checkpolicy/Config.in"
 	source "package/ima-evm-utils/Config.in"
-	source "package/optee-benchmark/Config.in"
 	source "package/optee-client/Config.in"
 	source "package/optee-examples/Config.in"
 	source "package/optee-test/Config.in"
diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
deleted file mode 100644
index 2070582fbb..0000000000
--- a/package/optee-benchmark/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@ 
-config BR2_PACKAGE_OPTEE_BENCHMARK
-	bool "optee-benchmark"
-	depends on BR2_USE_MMU # fork()
-	depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
-	depends on !BR2_STATIC_LIBS # optee-client
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client
-	select BR2_PACKAGE_OPTEE_CLIENT
-	select BR2_PACKAGE_LIBYAML
-	help
-	  Enable the OP-TEE benchmark package that brings facilities
-	  for profiling traversal and execution timings when
-	  invoking OP-TEE. OP-TEE benchmark is a component delivered
-	  by the OP-TEE project.
-
-	  http://github.com/linaro-swg/optee_benchmark
-
-comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
-		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
deleted file mode 100644
index d74a24c8ab..0000000000
--- a/package/optee-benchmark/optee-benchmark.hash
+++ /dev/null
@@ -1,4 +0,0 @@ 
-# From https://github.com/linaro-swg/optee_benchmark/archive/3.19.0/optee-benchmark-3.19.0.tar.gz
-sha256  32f41854bf07eb7bb89dfc702da023c3a99518c33fbe7edf0e1f004e29a8c90c  optee-benchmark-3.19.0.tar.gz
-# Locally computed
-sha256  0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383  LICENSE
diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
deleted file mode 100644
index 338a51ada4..0000000000
--- a/package/optee-benchmark/optee-benchmark.mk
+++ /dev/null
@@ -1,14 +0,0 @@ 
-################################################################################
-#
-# optee-benchmark
-#
-################################################################################
-
-OPTEE_BENCHMARK_VERSION = 3.19.0
-OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION))
-OPTEE_BENCHMARK_LICENSE = BSD-2-Clause
-OPTEE_BENCHMARK_LICENSE_FILES = LICENSE
-
-OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml
-
-$(eval $(cmake-package))