[OS-BUILD PATCHv2] redhat: configs: fix CONFIG_WERROR replace in build_configs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Jan Stancek <jstancek@xxxxxxxxxx>

redhat: configs: fix CONFIG_WERROR replace in build_configs

$$ is the process ID (PID) of the script itself, and current script
leads to issues where WERROR doesn't get randomly set, when pid
happens to be too low (e.g. in CKI container)

Drop the line range, let sed run over entire file.

Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx>

diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/build_configs.sh
+++ b/redhat/configs/build_configs.sh
@@ -112,7 +112,7 @@ function merge_configs()
 	sort config-merging."$count" >> "$name"
 
 	if [ -n "$ENABLE_WERROR" ]; then
-	       sed -i "1,$$s|# CONFIG_WERROR is not set|CONFIG_WERROR=y|g" "$name"
+		sed -i "s|# CONFIG_WERROR is not set|CONFIG_WERROR=y|g" "$name"
 	fi
 
 	rm -f config-merged."$count" config-merging."$count"

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2466
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux