[Buildroot] [PATCH v1 1/1] package/bootgen: bump to xilinx_v2023.2

[Buildroot] [PATCH v1 1/1] package/bootgen: bump to xilinx_v2023.2

[Neal Frager via buildroot]

Bump bootgen to xilinx_v2023.2.

With version xilinx_v2023.2, the flexlexer patch has been fully applied:
https://github.com/Xilinx/bootgen/commit/8e6702bb5064b806e45028486de7376962470a36

Thus the flexlexer patch can finally be removed from buildroot.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 ...n-machines-with-modern-flex-versions.patch | 69 -------------------
 package/bootgen/bootgen.hash                  |  2 +-
 package/bootgen/bootgen.mk                    |  2 +-
 3 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 package/bootgen/0001-Refix-builds-on-machines-with-modern-flex-versions.patch

diff --git a/package/bootgen/0001-Refix-builds-on-machines-with-modern-flex-versions.patch b/package/bootgen/0001-Refix-builds-on-machines-with-modern-flex-versions.patch
deleted file mode 100644
index b13dd2b03b..0000000000
--- a/package/bootgen/0001-Refix-builds-on-machines-with-modern-flex-versions.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 29a4e487527d109f517fc47a7c284b7732b27a10 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Mon, 12 Jun 2023 21:04:25 +0200
-Subject: [PATCH] Refix builds on machines with modern flex versions
-
-Bootgen embeds an old version of flex, but uses the system include syntax
-(#include <>) to reference it, causing conflicts on systems with the
-development headers for a modern flex version installed, leading to build
-issues like:
-
-../bisonflex/cmdoptions.yy.cpp: In member function 'virtual int CO::FlexScanner::yylex()':
-../bisonflex/cmdoptions.yy.cpp:1362:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream<char>'} and 'std::istream*' {aka 'std::basic_istream<char>*'})
-
-http://autobuild.buildroot.net/results/293/2936d9b054269b7055e66ab5a7f7c1f7f4926d48/build-end.log
-
-Fix it by using normal local #include statements by:
-
-sed -i 's/<FlexLexer.h>/"FlexLexer.h"/g' *
-
-Notice: This was already fixed on master with:
-https://github.com/Xilinx/bootgen/pull/20
-
-Notice: The patch was not applied, instead a different patch with the same
-content was applied to master:
-https://github.com/Xilinx/bootgen/commit/af4f7083ea92931a07e47995eb2bc2a348c577ed
-
-This patch was not applied to the xlnx_rel_v2023.1 branch, instead most
-of the content was included in:
-https://github.com/Xilinx/bootgen/commit/bfba91b2c84160dc203ff09f0e930d82ed06a83a
-
-But the cmdoptions.yy.cpp and reginit.yy.cpp hunks were accidently dropped:
-https://github.com/Xilinx/bootgen/commit/bfba91b2c84160dc203ff09f0e930d82ed06a83a#diff-e0287adb420dbecc112acdf7d4a1efba8ea6cbf06401e4e8679b8ffd22a091d8
-
-Upstream: https://github.com/Xilinx/bootgen/pull/24
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- cmdoptions.yy.cpp | 2 +-
- reginit.yy.cpp    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmdoptions.yy.cpp b/cmdoptions.yy.cpp
-index 38fed35..4e940ab 100644
---- a/cmdoptions.yy.cpp
-+++ b/cmdoptions.yy.cpp
-@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
- 
- #define yytext_ptr yytext
- 
--#include <FlexLexer.h>
-+#include "FlexLexer.h"
- 
- int yyFlexLexer::yywrap() { return 1; }
- int yyFlexLexer::yylex()
-diff --git a/reginit.yy.cpp b/reginit.yy.cpp
-index d830734..dede473 100644
---- a/reginit.yy.cpp
-+++ b/reginit.yy.cpp
-@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
- 
- #define yytext_ptr yytext
- 
--#include <FlexLexer.h>
-+#include "FlexLexer.h"
- 
- int yyFlexLexer::yywrap() { return 1; }
- int yyFlexLexer::yylex()
--- 
-2.30.2
-
diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash
index 937509c859..6f34b2b850 100644
--- a/package/bootgen/bootgen.hash
+++ b/package/bootgen/bootgen.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  2fda35fac28f5753cfdd9c6d5c07fd2b018d55984681af79415a67ba5372ea8e  bootgen-xilinx_v2023.1.tar.gz
+sha256  aa8120369d8a6016c731a3338188045c82833602e8ea955b53130a16560e5eb3  bootgen-xilinx_v2023.2.tar.gz
 sha256  4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3  LICENSE
diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk
index d83980d925..70338090f4 100644
--- a/package/bootgen/bootgen.mk
+++ b/package/bootgen/bootgen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOOTGEN_VERSION = xilinx_v2023.1
+BOOTGEN_VERSION = xilinx_v2023.2
 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION))
 HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf
 BOOTGEN_LICENSE = Apache-2.0
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/1] package/bootgen: bump to xilinx_v2023.2

[Peter Korsgaard]

>>>>> "Neal" == Neal Frager <neal.frager@amd.com> writes:

 > Bump bootgen to xilinx_v2023.2.
 > With version xilinx_v2023.2, the flexlexer patch has been fully applied:
 > https://github.com/Xilinx/bootgen/commit/8e6702bb5064b806e45028486de7376962470a36

 > Thus the flexlexer patch can finally be removed from buildroot.

Wee!

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot