Re: [ptxdist] [APPLIED] fbtest: version bump 2014-08-11-g29ab066 -> 2023-03-28-g47f6351

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 4ef2884e8b4d71d4020af902c691318d2a305daa.

Michael

[sent from post-receive hook]

On Sat, 08 Jul 2023 09:02:48 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Add a patch to fix build with GCC 13.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230630084547.1142768-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/fbtest-2014-08-11-g29ab066/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch b/patches/fbtest-2023-03-28-g47f6351/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
> similarity index 99%
> rename from patches/fbtest-2014-08-11-g29ab066/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
> rename to patches/fbtest-2023-03-28-g47f6351/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
> index 0baef3cd7b85..97b5d1c82a94 100644
> --- a/patches/fbtest-2014-08-11-g29ab066/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
> +++ b/patches/fbtest-2023-03-28-g47f6351/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
> @@ -19,7 +19,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>   create mode 100644 images/penguin.c
>  
>  diff --git a/Makefile b/Makefile
> -index 9a0a7ad95d9b..1557199d1fb5 100644
> +index 5041f6ca5ca1..512a684f5f32 100644
>  --- a/Makefile
>  +++ b/Makefile
>  @@ -3,7 +3,7 @@ TOPDIR = .
> diff --git a/patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch b/patches/fbtest-2023-03-28-g47f6351/0002-add-install-target.patch
> similarity index 83%
> rename from patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch
> rename to patches/fbtest-2023-03-28-g47f6351/0002-add-install-target.patch
> index 636226d537f8..3e65cbaa4b0d 100644
> --- a/patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch
> +++ b/patches/fbtest-2023-03-28-g47f6351/0002-add-install-target.patch
> @@ -9,10 +9,10 @@ Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
>   1 file changed, 2 insertions(+)
>  
>  diff --git a/Makefile b/Makefile
> -index 1557199d1fb5..1f926b4cf6be 100644
> +index 512a684f5f32..c20376dccf70 100644
>  --- a/Makefile
>  +++ b/Makefile
> -@@ -12,3 +12,5 @@ include $(TOPDIR)/Rules.make
> +@@ -13,3 +13,5 @@ include $(TOPDIR)/Rules.make
>   
>   images:	pnmtohex
>   
> diff --git a/patches/fbtest-2023-03-28-g47f6351/0003-Initialize-ticks-in-benchmark.patch b/patches/fbtest-2023-03-28-g47f6351/0003-Initialize-ticks-in-benchmark.patch
> new file mode 100644
> index 000000000000..0360f05b9cf6
> --- /dev/null
> +++ b/patches/fbtest-2023-03-28-g47f6351/0003-Initialize-ticks-in-benchmark.patch
> @@ -0,0 +1,29 @@
> +From: Philipp Zabel <p.zabel@pengutronix.de>
> +Date: Thu, 29 Jun 2023 10:28:40 +0200
> +Subject: [PATCH] Initialize ticks in benchmark()
> +
> +Fixes a build error with GCC 13:
> +
> +  util.c: In function 'benchmark':
> +  util.c:177:17: error: 'ticks' may be used uninitialized [-Werror=maybe-uninitialized]
> +  util.c:161:14: note: 'ticks' was declared here
> +
> +Link: https://lore.kernel.org/r/20230629082840.888110-1-p.zabel@pengutronix.de
> +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> +---
> + util.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/util.c b/util.c
> +index cdf89b38618a..1193523990e7 100644
> +--- a/util.c
> ++++ b/util.c
> +@@ -158,7 +158,7 @@ static uint64_t get_ticks(void)
> + 
> + double benchmark(void (*func)(unsigned long n, void *data), void *data)
> + {
> +-    uint64_t ticks;
> ++    uint64_t ticks = 0;
> +     unsigned long n = 1;
> + 
> +     printf("Benchmarking... ");
> diff --git a/patches/fbtest-2014-08-11-g29ab066/series b/patches/fbtest-2023-03-28-g47f6351/series
> similarity index 60%
> rename from patches/fbtest-2014-08-11-g29ab066/series
> rename to patches/fbtest-2023-03-28-g47f6351/series
> index af761ac8d633..d3af842b3291 100644
> --- a/patches/fbtest-2014-08-11-g29ab066/series
> +++ b/patches/fbtest-2023-03-28-g47f6351/series
> @@ -2,4 +2,5 @@
>  #tag:base --start-number 1
>  0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
>  0002-add-install-target.patch
> -# 96842eebf8f8f3ef2bf71367ce23f9cd  - git-ptx-patches magic
> +0003-Initialize-ticks-in-benchmark.patch
> +# 552895bf186281b657d9f116ef4cae0d  - git-ptx-patches magic
> diff --git a/rules/fbtest.make b/rules/fbtest.make
> index 16d9941c9256..5d0810bf9389 100644
> --- a/rules/fbtest.make
> +++ b/rules/fbtest.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_FBTEST) += fbtest
>  #
>  # Paths and names
>  #
> -FBTEST_VERSION	:= 2014-08-11-g29ab066
> -FBTEST_MD5	:= 48d1f4e6450ded48c44733539c1c9614
> +FBTEST_VERSION	:= 2023-03-28-g47f6351
> +FBTEST_MD5	:= 3523551d53c89c83505cad8d9cbf2bfe
>  FBTEST		:= fbtest-$(FBTEST_VERSION)
>  FBTEST_SUFFIX	:= tar.gz
>  FBTEST_URL	:= https://git.kernel.org/pub/scm/linux/kernel/git/geert/fbtest.git;tag=$(FBTEST_VERSION)