[Buildroot] [git commit] package/bootgen: bump to xilinx_v2023.1

[Buildroot] [git commit] package/bootgen: bump to xilinx_v2023.1

[Peter Korsgaard]

commit: https://git.buildroot.net/buildroot/commit/?id=e4ac14e09a57667168278187331cdf7238b80324
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

This patch bumps bootgen to version xilinx_v2023.1.
The patch for build machines with modern flex is no longer needed.

Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .checkpackageignore                                |   1 -
 ...01-Fix-build-on-machines-with-modern-flex.patch | 133 ---------------------
 package/bootgen/bootgen.hash                       |   2 +-
 package/bootgen/bootgen.mk                         |   2 +-
 4 files changed, 2 insertions(+), 136 deletions(-)

Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [git commit] package/bootgen: bump to xilinx_v2023.1

[Bernd Kuhls]

Am Tue, 16 May 2023 16:48:25 +0200 schrieb Peter Korsgaard:

> commit:
> https://git.buildroot.net/buildroot/commit/?
id=e4ac14e09a57667168278187331cdf7238b80324
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> 
> This patch bumps bootgen to version xilinx_v2023.1.
> The patch for build machines with modern flex is no longer needed.

Hi Neal, hi Peter,

on my machine I cannot reproduce the flex bug but it seems it occurs 
again after bumping this package which removed the patch:
http://autobuild.buildroot.net/?reason=host-bootgen-xilinx_v2023.1

Regards, Bernd

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

Re: [Buildroot] [git commit] package/bootgen: bump to xilinx_v2023.1

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Am Tue, 16 May 2023 16:48:25 +0200 schrieb Peter Korsgaard:
 >> commit:
 >> https://git.buildroot.net/buildroot/commit/?
 > id=e4ac14e09a57667168278187331cdf7238b80324
 >> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
 >> 
 >> This patch bumps bootgen to version xilinx_v2023.1.
 >> The patch for build machines with modern flex is no longer needed.

 > Hi Neal, hi Peter,

 > on my machine I cannot reproduce the flex bug but it seems it occurs 
 > again after bumping this package which removed the patch:
 > http://autobuild.buildroot.net/?reason=host-bootgen-xilinx_v2023.1

I also cannot reproduce it here, but looking at the build issues, it
seems to get confused building cmdoptions.yy.cpp which some mixup
between pointer-to vs reference-to std::iostream:

../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>*'})

This was indeed changed in Flex 2.6 almost 8 years ago:

https://github.com/westes/flex/commit/336a1deaa57975f34cd732d656d1c0cbe3d5233a

But bootgen embeds an (ancient) flex 2.5.35:

https://github.com/Xilinx/bootgen/blob/master/bif.yy.cpp#L18-L20

It is a bit hard to follow as the 2023.1 tag seems to have a number of
squashed commits rather than the commits from master, but:

The patch was upstreamed here:
https://github.com/Xilinx/bootgen/pull/20

The patch was not applied, instead a different patch with the same
content 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 hunk was (accidently?) dropped:
https://github.com/Xilinx/bootgen/commit/bfba91b2c84160dc203ff09f0e930d82ed06a83a#diff-e0287adb420dbecc112acdf7d4a1efba8ea6cbf06401e4e8679b8ffd22a091d8

I'll send a patch to fix that.

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

Re: [Buildroot] [git commit] package/bootgen: bump to xilinx_v2023.1

[Frager, Neal via buildroot]

Hi Peter,


> Le 12 juin 2023 à 17:47, Peter Korsgaard <peter@korsgaard.com> a écrit :
> 
> 
>> 
>>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> 
>> Am Tue, 16 May 2023 16:48:25 +0200 schrieb Peter Korsgaard:
>>> commit:
>>> https://git.buildroot.net/buildroot/commit/?
>> id=e4ac14e09a57667168278187331cdf7238b80324
>>> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>>> 
>>> This patch bumps bootgen to version xilinx_v2023.1.
>>> The patch for build machines with modern flex is no longer needed.
> 
>> Hi Neal, hi Peter,
> 
>> on my machine I cannot reproduce the flex bug but it seems it occurs 
>> again after bumping this package which removed the patch:
>> http://autobuild.buildroot.net/?reason=host-bootgen-xilinx_v2023.1
> 
> I also cannot reproduce it here, but looking at the build issues, it
> seems to get confused building cmdoptions.yy.cpp which some mixup
> between pointer-to vs reference-to std::iostream:
> 
> ../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>*'})
> 
> This was indeed changed in Flex 2.6 almost 8 years ago:
> 
> https://github.com/westes/flex/commit/336a1deaa57975f34cd732d656d1c0cbe3d5233a
> 
> But bootgen embeds an (ancient) flex 2.5.35:
> 
> https://github.com/Xilinx/bootgen/blob/master/bif.yy.cpp#L18-L20
> 
> It is a bit hard to follow as the 2023.1 tag seems to have a number of
> squashed commits rather than the commits from master, but:
> 
> The patch was upstreamed here:
> https://github.com/Xilinx/bootgen/pull/20
> 
> The patch was not applied, instead a different patch with the same
> content 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 hunk was (accidently?) dropped:
> https://github.com/Xilinx/bootgen/commit/bfba91b2c84160dc203ff09f0e930d82ed06a83a#diff-e0287adb420dbecc112acdf7d4a1efba8ea6cbf06401e4e8679b8ffd22a091d8
> 
> I'll send a patch to fix that.

Thank you for catching this.  I imagine it was indeed a mistake since the patches were squashed together.  I will communicate this to the team responsible.

We should be able to resolve this properly in the 2023.2 release.

I apologize for this inconvenience.

> 
> -- 
> Bye, Peter Korsgaard

Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot