qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge: redhat: remove gcc version check for ENABLE_WERROR 

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4201

JIRA: https://issues.redhat.com/browse/RHEL-43372  
Upstream Status: RHEL-only  
  
This does not work when dist-configs occur on a machine that is not  
where the kernel will be built (dist-srpm, dist-koji, dist-brew...) and  
does not handle cross builds.  
  
Drop the test and restore the ARK behavior introduced in  
  commit b2e6681bbb ("redhat/Makefile.variables: Add ENABLE_WERROR")  
  
Signed-off-by: Eric Chanudet <echanude@redhat.com>

Approved-by: Desnes Nunes <desnesn@redhat.com>
Approved-by: Alessandro Carminati <acarmina@redhat.com>
Approved-by: Steve Dunnagan <sdunnaga@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Lucas Zampieri <lzampier@redhat.com>
This commit is contained in:
Lucas Zampieri 2024-06-27 14:07:16 +00:00
parent c49e097ff7 cc80fcd051
commit c7c3dea664
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
redhat/configs/build_configs.sh
View File

@ -110,8 +110,7 @@ function merge_configs()
sort config-merging."$count" >> "$name"
gcc_version=$(echo __GNUC__ | gcc -E -xc - | grep -v "#")
if [ "$gcc_version" -eq 11 ] && [ -n "$ENABLE_WERROR" ]; then
if [ -n "$ENABLE_WERROR" ]; then
sed -i "s|# CONFIG_WERROR is not set|CONFIG_WERROR=y|g" "$name"
fi