packages/containers-common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!14 Replace openEuler with %{_vendor}

Browse Source 
From: @yue-yuankun 
Reviewed-by: @wonleing 
Signed-off-by: @wonleing
This commit is contained in:
openeuler-ci-bot 2024-04-24 06:07:41 +00:00 committed by Gitee
commit 012bc7a771
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
containers-common.spec
View File

@ -15,7 +15,7 @@
Epoch: 4 Epoch: 4
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 3 Release: 4
Summary: Common configuration and documentation for containers. Summary: Common configuration and documentation for containers.
URL: https://github.com/containers/common URL: https://github.com/containers/common
License: Apache-2.0 License: Apache-2.0
@ -100,7 +100,7 @@ for FILE in $(ls *.5.md); do
done done
cp man5/containerignore.5 man5/.containerignore.5 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
# install config and policy files for registries # 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 -m0644 containers.conf %{buildroot}%{_datadir}/containers/containers.conf
# install secrets patch directory # install secrets patch directory
install -d -p -m 755 %{buildroot}/%{_datadir}/openEuler/secrets install -d -p -m 755 %{buildroot}/%{_datadir}/%{_vendor}/secrets
ln -s ../../../..%{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/openEuler/secrets/etc-pki-entitlement ln -s ../../../..%{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/%{_vendor}/secrets/etc-pki-entitlement
ln -s ../../../..%{_sysconfdir}/rhsm %{buildroot}%{_datadir}/openEuler/secrets/rhsm ln -s ../../../..%{_sysconfdir}/rhsm %{buildroot}%{_datadir}/%{_vendor}/secrets/rhsm
ln -s ../../../..%{_sysconfdir}/yum.repos.d/openEuler.repo %{buildroot}%{_datadir}/openEuler/secrets/openEuler.repo ln -s ../../../..%{_sysconfdir}/yum.repos.d/%{_vendor}.repo %{buildroot}%{_datadir}/%{_vendor}/secrets/%{_vendor}.repo
%post %post
if [[ $1 == 1 ]]; then if [[ $1 == 1 ]]; then
@ -160,10 +160,13 @@ fi
%{_datadir}/containers/containers.conf %{_datadir}/containers/containers.conf
%{_datadir}/containers/mounts.conf %{_datadir}/containers/mounts.conf
%{_datadir}/containers/seccomp.json %{_datadir}/containers/seccomp.json
%dir %{_datadir}/openEuler/secrets %dir %{_datadir}/%{_vendor}/secrets
%{_datadir}/openEuler/secrets/* %{_datadir}/%{_vendor}/secrets/*
%changelog %changelog
* Wed Apr 24 2024 yueyuankun <yueyuankun@kylinos.cn> - 4:1-4
- Replace openEuler with %{_vendor}
* Thu Jan 18 2024 lijian <lijian2@kylinos.cn> - 4:1-3 * Thu Jan 18 2024 lijian <lijian2@kylinos.cn> - 4:1-3
- Avoid building systems that cannot handle hidden files - Avoid building systems that cannot handle hidden files