From f73ed8157555a4f7e360457c1295fca8c551177b Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Tue, 23 Apr 2024 14:54:53 +0800 Subject: [PATCH] Replace openEuler with %{_vendor} (cherry picked from commit b5789e16077553a8b6c9f38b0bdf11e44db2b99c) --- containers-common.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/containers-common.spec b/containers-common.spec index d29e2c8..7810c50 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -15,7 +15,7 @@ Epoch: 4 Name: containers-common Version: 1 -Release: 3 +Release: 4 Summary: Common configuration and documentation for containers. URL: https://github.com/containers/common License: Apache-2.0 @@ -100,7 +100,7 @@ for FILE in $(ls *.5.md); do done cp man5/containerignore.5 man5/.containerignore.5 -sed -i "s/rhel/openEuler/g" mounts.conf +sed -i "s/rhel/%{_vendor}/g" mounts.conf %install # install config and policy files for registries @@ -124,10 +124,10 @@ install -m0644 seccomp.json %{buildroot}%{_datadir}/containers/seccomp.json install -m0644 containers.conf %{buildroot}%{_datadir}/containers/containers.conf # install secrets patch directory -install -d -p -m 755 %{buildroot}/%{_datadir}/openEuler/secrets -ln -s ../../../..%{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/openEuler/secrets/etc-pki-entitlement -ln -s ../../../..%{_sysconfdir}/rhsm %{buildroot}%{_datadir}/openEuler/secrets/rhsm -ln -s ../../../..%{_sysconfdir}/yum.repos.d/openEuler.repo %{buildroot}%{_datadir}/openEuler/secrets/openEuler.repo +install -d -p -m 755 %{buildroot}/%{_datadir}/%{_vendor}/secrets +ln -s ../../../..%{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/%{_vendor}/secrets/etc-pki-entitlement +ln -s ../../../..%{_sysconfdir}/rhsm %{buildroot}%{_datadir}/%{_vendor}/secrets/rhsm +ln -s ../../../..%{_sysconfdir}/yum.repos.d/%{_vendor}.repo %{buildroot}%{_datadir}/%{_vendor}/secrets/%{_vendor}.repo %post if [[ $1 == 1 ]]; then @@ -160,10 +160,13 @@ fi %{_datadir}/containers/containers.conf %{_datadir}/containers/mounts.conf %{_datadir}/containers/seccomp.json -%dir %{_datadir}/openEuler/secrets -%{_datadir}/openEuler/secrets/* +%dir %{_datadir}/%{_vendor}/secrets +%{_datadir}/%{_vendor}/secrets/* %changelog +* Wed Apr 24 2024 yueyuankun - 4:1-4 +- Replace openEuler with %{_vendor} + * Thu Jan 18 2024 lijian - 4:1-3 - Avoid building systems that cannot handle hidden files -- Gitee