From 10200f609e3aac7f58ed279f8856ad2c9ebed092 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Wed, 12 Jun 2024 11:32:43 +0200 Subject: [PATCH] fix: rpmmacros is unnecessary with split-gpg2 --- salt/qubes-builder/configure.sls | 8 -------- salt/qubes-builder/files/client/rpmmacros | 15 --------------- 2 files changed, 23 deletions(-) delete mode 100644 salt/qubes-builder/files/client/rpmmacros diff --git a/salt/qubes-builder/configure.sls b/salt/qubes-builder/configure.sls index e5aacd6..c7bd21f 100644 --- a/salt/qubes-builder/configure.sls +++ b/salt/qubes-builder/configure.sls @@ -15,14 +15,6 @@ include: - dotfiles.copy-x11 - docker.configure -"{{ slsdotpath }}-rpmmacros": - file.managed: - - name: /home/user/.rpmmacros - - source: salt://{{ slsdotpath }}/files/client/rpmmacros - - mode: '0644' - - user: user - - group: user - "{{ slsdotpath }}-makedir-src": file.directory: - name: /home/user/src diff --git a/salt/qubes-builder/files/client/rpmmacros b/salt/qubes-builder/files/client/rpmmacros deleted file mode 100644 index a360a1e..0000000 --- a/salt/qubes-builder/files/client/rpmmacros +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-FileCopyrightText: 2019 - 2023 The Qubes OS Project -# -# SPDX-License-Identifier: GPL-2.0-only - -%__gpg /usr/bin/gpg2 - -%__gpg_check_password_cmd %{__gpg} \ - gpg --batch --no-verbose -u "%{_gpg_name}" -s - -%__gpg_sign_cmd /bin/sh sh -c '/usr/bin/gpg2 \\\ - --batch --no-verbose \\\ - %{?_gpg_digest_algo:--digest-algo %{_gpg_digest_algo}} \\\ - -u "%{_gpg_name}" \\\ - -sb %{__plaintext_filename} \\\ - >%{__signature_filename}'