From fc7c2c628c01ecdb14d456098a7042d9912feb55 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Wed, 17 Nov 2021 15:32:03 -0800 Subject: [PATCH] Correctly identify configuration files in RPM spec files In RPM spec files it is desirable to prefix configuration files with "%config" in order to preserve/save any user modifications during RPM upgrade. Fix sgx-ra-service.spec: The spec file attempts to prefix "/etc/rad.conf" with prefix %config. There is no /etc/rad.conf file being packaged. The configuration file that is actually packaged is "/etc/mpa_registration.conf". Fix sgx-pck-id-retrieval-tool.spec The spec file attempts to prefix "/etc/rad.conf" with prefix %config. There is no /etc/rad.conf file being packaged. The config file we actually want to prefix with %config is "network_setting.conf". Although this file is distributed, it is not listed in "%{_specdir}/list-%name". "%{_specdir}/list-%name" only contains the name of the installation folder "%{_install_path}". It is unclear if this was intended, most likely not. Hence we cannot use "sed" for prefixing. Instead of mdifying a presumably existing line with "sed" we simply append "%{_specdir}/list-%name" with the desired line. Signed-off-by: Juro Bystricky --- .../sgx-pck-id-retrieval-tool/sgx-pck-id-retrieval-tool.spec | 2 +- .../package/installer/rpm/sgx-ra-service/sgx-ra-service.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/PCKRetrievalTool/installer/rpm/sgx-pck-id-retrieval-tool/sgx-pck-id-retrieval-tool.spec b/tools/PCKRetrievalTool/installer/rpm/sgx-pck-id-retrieval-tool/sgx-pck-id-retrieval-tool.spec index 58821482..8248a693 100644 --- a/tools/PCKRetrievalTool/installer/rpm/sgx-pck-id-retrieval-tool/sgx-pck-id-retrieval-tool.spec +++ b/tools/PCKRetrievalTool/installer/rpm/sgx-pck-id-retrieval-tool/sgx-pck-id-retrieval-tool.spec @@ -56,7 +56,7 @@ find %{?buildroot} | sort | \ awk '$0 !~ last "/" {print last} {last=$0} END {print last}' | \ sed -e "s#^%{?buildroot}##" | \ grep -v "^%{_install_path}" >> %{_specdir}/list-%{name} || : -sed -i 's#^/etc/rad.conf#%config &#' %{_specdir}/list-%{name} +echo "%config %{_install_path}/network_setting.conf" >> %{_specdir}/list-%{name} %files -f %{_specdir}/list-%{name} diff --git a/tools/SGXPlatformRegistration/package/installer/rpm/sgx-ra-service/sgx-ra-service.spec b/tools/SGXPlatformRegistration/package/installer/rpm/sgx-ra-service/sgx-ra-service.spec index 47b27f81..055ea067 100644 --- a/tools/SGXPlatformRegistration/package/installer/rpm/sgx-ra-service/sgx-ra-service.spec +++ b/tools/SGXPlatformRegistration/package/installer/rpm/sgx-ra-service/sgx-ra-service.spec @@ -56,7 +56,7 @@ find %{?buildroot} | sort | \ awk '$0 !~ last "/" {print last} {last=$0} END {print last}' | \ sed -e "s#^%{?buildroot}##" | \ grep -v "^%{_install_path}" >> %{_specdir}/list-%{name} || : -sed -i 's#^/etc/rad.conf#%config &#' %{_specdir}/list-%{name} +sed -i 's#^/etc/mpa_registration.conf#%config &#' %{_specdir}/list-%{name} %files -f %{_specdir}/list-%{name}