Skip to content
This repository has been archived by the owner on Feb 24, 2025. It is now read-only.

fix: Move policy.json back to /usr/etc temporarily while issues are worked out #311

Merged
merged 1 commit into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ADD files/etc/systemd /tmp/ublue-os/update-services/etc/systemd
ADD files/usr/lib/systemd /tmp/ublue-os/update-services/usr/lib/systemd

ADD files/etc/containers /tmp/ublue-os/signing/etc/containers
ADD files/usr/etc/containers /tmp/ublue-os/signing/usr/etc/containers
ADD files/etc/pki /tmp/ublue-os/signing/etc/pki

RUN tar cf /tmp/ublue-os/rpmbuild/SOURCES/ublue-os-udev-rules.tar.gz -C /tmp ublue-os/udev-rules
Expand Down
10 changes: 7 additions & 3 deletions rpmspec/ublue-os-signing.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Name: ublue-os-signing
Packager: ublue-os
Vendor: ublue-os
Version: 0.3
Version: 0.4
Release: 1%{?dist}
Summary: Signing files and keys for Universal Blue
License: MIT
Expand All @@ -23,24 +23,28 @@ Adds files and keys for signing Universal Blue images
mkdir -p -m0755 %{buildroot}%{_datadir}/%{VENDOR}
mkdir -p -m0755 %{buildroot}%{_sysconfdir}/containers/registries.d
mkdir -p -m0755 %{buildroot}%{_sysconfdir}/pki
mkdir -p -m0755 %{buildroot}%{_exec_prefix}/etc/containers

tar xf %{SOURCE0} -C %{buildroot}%{_datadir}/%{VENDOR} --strip-components=1
tar xf %{SOURCE0} -C %{buildroot} --strip-components=2

%files
%dir %attr(0755,root,root) %{_datadir}/%{VENDOR}/%{sub_name}
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/policy.json
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/etc/containers/policy.json
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/registries.d/ublue-os.yaml
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/pki/containers/ublue-os.pub
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/registries.d/quay.io-toolbx-images.yaml
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/pki/containers/quay.io-toolbx-images.pub
%attr(0644,root,root) %{_sysconfdir}/containers/policy.json
%attr(0644,root,root) %{_exec_prefix}/etc/containers/policy.json
%attr(0644,root,root) %{_sysconfdir}/containers/registries.d/ublue-os.yaml
%attr(0644,root,root) %{_sysconfdir}/pki/containers/ublue-os.pub
%attr(0644,root,root) %{_sysconfdir}/containers/registries.d/quay.io-toolbx-images.yaml
%attr(0644,root,root) %{_sysconfdir}/pki/containers/quay.io-toolbx-images.pub

%changelog
* Thu Aug 08 2024 Kyle Gospodnetich <me@kylegospodneti.ch> - 0.4
- Moved policy.json back to /usr/etc/ temporarily

* Wed Aug 07 2024 Kyle Gospodnetich <me@kylegospodneti.ch> - 0.3
- Moved files from /usr/etc/ to /etc/

Expand Down
Loading