From e7f7d1f94dd2ffcb06ff2eb3ed78821114b5412d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Tue, 12 Mar 2024 12:01:03 +0100 Subject: [PATCH] fix: `file listed twice` and `absolute symlink` rpm build warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix RPM build warnings: File listed twice: /etc/fdo/keys absolute symlink: /usr/libexec/fdo/fdo-owner-tool -> /usr/bin/fdo-owner-tool absolute symlink: /usr/libexec/fdo/fdo-admin-tool -> /usr/bin/fdo-admin-tool Signed-off-by: Miguel Martín --- fido-device-onboard.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec index 89dfcfa05..20953ed89 100644 --- a/fido-device-onboard.spec +++ b/fido-device-onboard.spec @@ -83,8 +83,9 @@ install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_owner_onb install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_rendezvous_server_postgres migrations/migrations_rendezvous_server_postgres/2023-10-03-152801_create_db/* install -D -m 0644 -t %{buildroot}%{_docdir}/fdo/migrations/migrations_rendezvous_server_sqlite migrations/migrations_rendezvous_server_sqlite/2023-10-03-152801_create_db/* # duplicates as needed by AIO command so link them -ln -s %{_bindir}/fdo-owner-tool %{buildroot}%{_libexecdir}/fdo/fdo-owner-tool -ln -s %{_bindir}/fdo-admin-tool %{buildroot}%{_libexecdir}/fdo/fdo-admin-tool +mkdir -p %{buildroot}%{_bindir} +ln -sr %{buildroot}%{_bindir}/fdo-owner-tool %{buildroot}%{_libexecdir}/fdo/fdo-owner-tool +ln -sr %{buildroot}%{_bindir}/fdo-admin-tool %{buildroot}%{_libexecdir}/fdo/fdo-admin-tool # Create directories needed by the various services so we own them mkdir -p %{buildroot}%{_sysconfdir}/fdo mkdir -p %{buildroot}%{_sysconfdir}/fdo/keys @@ -216,7 +217,6 @@ Requires: openssl-libs >= 3.0.1-12 %dir %{_sysconfdir}/fdo %dir %{_sysconfdir}/fdo/keys %dir %{_sysconfdir}/fdo/manufacturing-server.conf.d -%dir %{_sysconfdir}/fdo/keys %dir %{_sysconfdir}/fdo/stores %dir %{_sysconfdir}/fdo/stores/manufacturer_keys %dir %{_sysconfdir}/fdo/stores/manufacturing_sessions