From: Slava Barinov Date: Thu, 2 Sep 2021 12:09:31 +0000 (+0300) Subject: packaging: Check /etc/security existence before applying sed X-Git-Tag: accepted/tizen/6.5/base/20211028.055623~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01148bed9cd1bedd6e996f5c11037fb553f14bd6;p=platform%2Fupstream%2Fgcc-contrib.git packaging: Check /etc/security existence before applying sed This prevents post-script failure in {asan,hwasan}-force-options. Change-Id: I68e8fbdf2569b10017e484bcf3ff2f5a03219bfb Signed-off-by: Slava Barinov --- diff --git a/packaging/gcc-contrib.spec b/packaging/gcc-contrib.spec index 9dc0d0e..0e28c46 100644 --- a/packaging/gcc-contrib.spec +++ b/packaging/gcc-contrib.spec @@ -119,7 +119,8 @@ cat %{_rpmconfigdir}/macros.asan >> %{_rpmconfigdir}/tizen_macros # ASan needs a whole shadow address space # Using ulimit can only set the value for current user so we need to set /etc/security/limits.conf directly. -sed '/End of file/i\abuild\tsoft\tas\t-1\nabuild\thard\tas\t-1' -i /etc/security/limits.conf +[ -e /etc/security/limits.conf ] && \ + sed '/End of file/i\abuild\tsoft\tas\t-1\nabuild\thard\tas\t-1' -i /etc/security/limits.conf %preun -n asan-force-options # Restore read-only mode @@ -129,7 +130,8 @@ chmod a-w %{libsubdir} && find -L /emul/usr/*/gcc -name 'collect2' | xargs dirname | xargs chmod a-w /usr/bin/gcc-unforce-options # Restore limit configurations set for ASan -sed '/abuild/d' -i /etc/security/limits.conf +[ -e /etc/security/limits.conf ] && \ + sed '/abuild/d' -i /etc/security/limits.conf # Remove additional macros from config sed -e '\|^\# /etc/rpm/macros.asan$|,\|^\# /etc/rpm/macros.asan ends here|d' -i /usr/lib/rpm/tizen_macros @@ -172,7 +174,8 @@ EOF # HWASan needs a whole shadow address space # Using ulimit can only set the value for current user so we need to set /etc/security/limits.conf directly. -sed '/End of file/i\abuild\tsoft\tas\t-1\nabuild\thard\tas\t-1' -i /etc/security/limits.conf +[ -e /etc/security/limits.conf ] && \ + sed '/End of file/i\abuild\tsoft\tas\t-1\nabuild\thard\tas\t-1' -i /etc/security/limits.conf %preun -n hwasan-force-options # Restore read-only mode @@ -182,7 +185,8 @@ chmod a-w %{libsubdir} && find -L /emul/usr/*/gcc -name 'collect2' | xargs dirname | xargs chmod a-w /usr/bin/gcc-unforce-options # Restore limit configurations set for HWASan -sed '/abuild/d' -i /etc/security/limits.conf +[ -e /etc/security/limits.conf ] && \ + sed '/abuild/d' -i /etc/security/limits.conf %package -n ubsan-force-options Summary: Scripts to enable automatic package sanitization