From c3549275a5b5283fe502c8a9a892053c9186a881 Mon Sep 17 00:00:00 2001 From: James Pace Date: Thu, 12 Oct 2023 20:55:53 -0400 Subject: [PATCH] Make each distro provide a key. --- distro/cs9.ipp.yml | 31 +++++++++++++++++++++++++++++++ distro/f38.ipp.yml | 15 +++------------ images/container.mpp.yml | 1 - images/minimal.mpp.yml | 1 - include/build.ipp.yml | 1 - include/defaults.ipp.yml | 31 ------------------------------- 6 files changed, 34 insertions(+), 46 deletions(-) diff --git a/distro/cs9.ipp.yml b/distro/cs9.ipp.yml index 531a4cc..076b44d 100644 --- a/distro/cs9.ipp.yml +++ b/distro/cs9.ipp.yml @@ -22,3 +22,34 @@ mpp-vars: ostree_repo_url: http://j7s-os.internal.jpace121.net/repo ostree_ref: c9s/x86_64/edge ostree_remote_name: edge + distro_gpg_keys: | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v2.0.22 (GNU/Linux) + + mQINBFzMWxkBEADHrskpBgN9OphmhRkc7P/YrsAGSvvl7kfu+e9KAaU6f5MeAVyn + rIoM43syyGkgFyWgjZM8/rur7EMPY2yt+2q/1ZfLVCRn9856JqTIq0XRpDUe4nKQ + 8BlA7wDVZoSDxUZkSuTIyExbDf0cpw89Tcf62Mxmi8jh74vRlPy1PgjWL5494b3X + 5fxDidH4bqPZyxTBqPrUFuo+EfUVEqiGF94Ppq6ZUvrBGOVo1V1+Ifm9CGEK597c + aevcGc1RFlgxIgN84UpuDjPR9/zSndwJ7XsXYvZ6HXcKGagRKsfYDWGPkA5cOL/e + f+yObOnC43yPUvpggQ4KaNJ6+SMTZOKikM8yciyBwLqwrjo8FlJgkv8Vfag/2UR7 + JINbyqHHoLUhQ2m6HXSwK4YjtwidF9EUkaBZWrrskYR3IRZLXlWqeOi/+ezYOW0m + vufrkcvsh+TKlVVnuwmEPjJ8mwUSpsLdfPJo1DHsd8FS03SCKPaXFdD7ePfEjiYk + nHpQaKE01aWVSLUiygn7F7rYemGqV9Vt7tBw5pz0vqSC72a5E3zFzIIuHx6aANry + Gat3aqU3qtBXOrA/dPkX9cWE+UR5wo/A2UdKJZLlGhM2WRJ3ltmGT48V9CeS6N9Y + m4CKdzvg7EWjlTlFrd/8WJ2KoqOE9leDPeXRPncubJfJ6LLIHyG09h9kKQARAQAB + tDpDZW50T1MgKENlbnRPUyBPZmZpY2lhbCBTaWduaW5nIEtleSkgPHNlY3VyaXR5 + QGNlbnRvcy5vcmc+iQI3BBMBAgAhBQJczFsZAhsDBgsJCAcDAgYVCAIJCgsDFgIB + Ah4BAheAAAoJEAW1VbOEg8ZdjOsP/2ygSxH9jqffOU9SKyJDlraL2gIutqZ3B8pl + Gy/Qnb9QD1EJVb4ZxOEhcY2W9VJfIpnf3yBuAto7zvKe/G1nxH4Bt6WTJQCkUjcs + N3qPWsx1VslsAEz7bXGiHym6Ay4xF28bQ9XYIokIQXd0T2rD3/lNGxNtORZ2bKjD + vOzYzvh2idUIY1DgGWJ11gtHFIA9CvHcW+SMPEhkcKZJAO51ayFBqTSSpiorVwTq + a0cB+cgmCQOI4/MY+kIvzoexfG7xhkUqe0wxmph9RQQxlTbNQDCdaxSgwbF2T+gw + byaDvkS4xtR6Soj7BKjKAmcnf5fn4C5Or0KLUqMzBtDMbfQQihn62iZJN6ZZ/4dg + q4HTqyVpyuzMXsFpJ9L/FqH2DJ4exGGpBv00ba/Zauy7GsqOc5PnNBsYaHCply0X + 407DRx51t9YwYI/ttValuehq9+gRJpOTTKp6AjZn/a5Yt3h6jDgpNfM/EyLFIY9z + V6CXqQQ/8JRvaik/JsGCf+eeLZOw4koIjZGEAg04iuyNTjhx0e/QHEVcYAqNLhXG + rCTTbCn3NSUO9qxEXC+K/1m1kaXoCGA0UWlVGZ1JSifbbMx0yxq/brpEZPUYm+32 + o8XfbocBWljFUJ+6aljTvZ3LQLKTSPW7TFO+GXycAOmCGhlXh2tlc6iTc41PACqy + yy+mHmSv + =kkH7 + -----END PGP PUBLIC KEY BLOCK----- diff --git a/distro/f38.ipp.yml b/distro/f38.ipp.yml index e280fad..b06742a 100644 --- a/distro/f38.ipp.yml +++ b/distro/f38.ipp.yml @@ -3,28 +3,19 @@ mpp-vars: distro_name: f38 distro_version: 38 distro_baseurl: http://download.fedoraproject.org/pub/fedora/linux/ - distro_baseurl_repo: $distro_baseurl/updates/$distro_version/Everything/$arch/ osname: fedora - uefi_vendor: fedora - kernel_package: kernel - release_rpm: fedora-release - linux_firmware_rpm: linux-firmware distro_repos: - id: fedora baseurl: $distro_baseurl/releases/$distro_version/Everything/$arch/os/ - id: fedora-updates baseurl: $distro_baseurl/updates/$distro_version/Everything/$arch/ - - id: next - baseurl: https://download.copr.fedorainfracloud.org/results/@centos-automotive-sig/next/fedora-38-$arch/ distro_devel_repos: - id: fedora-updates-devel baseurl: $distro_baseurl/updates/$distro_version/Everything/$arch/ - - id: next-devel - baseurl: https://download.copr.fedorainfracloud.org/results/@centos-automotive-sig/next/fedora-38-$arch/ - distro_debug_repos: - - id: next-debug - baseurl: https://download.copr.fedorainfracloud.org/results/@centos-automotive-sig/next/fedora-38-$arch/ distro_module_id: platform:f38 + ostree_repo_url: http://j7s-os.internal.jpace121.net/repo + ostree_ref: f38/x86_64/edge + ostree_remote_name: edge distro_gpg_keys: | -----BEGIN PGP PUBLIC KEY BLOCK----- Comment: GPG-KEY-fedora-38 diff --git a/images/container.mpp.yml b/images/container.mpp.yml index 8cdd7f6..15f9108 100644 --- a/images/container.mpp.yml +++ b/images/container.mpp.yml @@ -16,7 +16,6 @@ pipelines: - type: org.osbuild.rpm options: gpgkeys: - - mpp-eval: centos_gpg_key - mpp-eval: distro_gpg_keys disable_dracut: true inputs: diff --git a/images/minimal.mpp.yml b/images/minimal.mpp.yml index 754222d..0c882ef 100644 --- a/images/minimal.mpp.yml +++ b/images/minimal.mpp.yml @@ -16,7 +16,6 @@ pipelines: - type: org.osbuild.rpm options: gpgkeys: - - mpp-eval: centos_gpg_key - mpp-eval: distro_gpg_keys disable_dracut: true exclude: diff --git a/include/build.ipp.yml b/include/build.ipp.yml index b65f424..aaf7a5d 100644 --- a/include/build.ipp.yml +++ b/include/build.ipp.yml @@ -35,7 +35,6 @@ pipelines: - shim-x64 options: gpgkeys: - - mpp-eval: centos_gpg_key - mpp-eval: distro_gpg_keys exclude: docs: true diff --git a/include/defaults.ipp.yml b/include/defaults.ipp.yml index 43a5a1d..aa60a20 100644 --- a/include/defaults.ipp.yml +++ b/include/defaults.ipp.yml @@ -103,37 +103,6 @@ mpp-vars: default_target_stages: [] target_stages: mpp-eval: locals().get('target_stages', default_target_stages) - centos_gpg_key: | - -----BEGIN PGP PUBLIC KEY BLOCK----- - Version: GnuPG v2.0.22 (GNU/Linux) - - mQINBFzMWxkBEADHrskpBgN9OphmhRkc7P/YrsAGSvvl7kfu+e9KAaU6f5MeAVyn - rIoM43syyGkgFyWgjZM8/rur7EMPY2yt+2q/1ZfLVCRn9856JqTIq0XRpDUe4nKQ - 8BlA7wDVZoSDxUZkSuTIyExbDf0cpw89Tcf62Mxmi8jh74vRlPy1PgjWL5494b3X - 5fxDidH4bqPZyxTBqPrUFuo+EfUVEqiGF94Ppq6ZUvrBGOVo1V1+Ifm9CGEK597c - aevcGc1RFlgxIgN84UpuDjPR9/zSndwJ7XsXYvZ6HXcKGagRKsfYDWGPkA5cOL/e - f+yObOnC43yPUvpggQ4KaNJ6+SMTZOKikM8yciyBwLqwrjo8FlJgkv8Vfag/2UR7 - JINbyqHHoLUhQ2m6HXSwK4YjtwidF9EUkaBZWrrskYR3IRZLXlWqeOi/+ezYOW0m - vufrkcvsh+TKlVVnuwmEPjJ8mwUSpsLdfPJo1DHsd8FS03SCKPaXFdD7ePfEjiYk - nHpQaKE01aWVSLUiygn7F7rYemGqV9Vt7tBw5pz0vqSC72a5E3zFzIIuHx6aANry - Gat3aqU3qtBXOrA/dPkX9cWE+UR5wo/A2UdKJZLlGhM2WRJ3ltmGT48V9CeS6N9Y - m4CKdzvg7EWjlTlFrd/8WJ2KoqOE9leDPeXRPncubJfJ6LLIHyG09h9kKQARAQAB - tDpDZW50T1MgKENlbnRPUyBPZmZpY2lhbCBTaWduaW5nIEtleSkgPHNlY3VyaXR5 - QGNlbnRvcy5vcmc+iQI3BBMBAgAhBQJczFsZAhsDBgsJCAcDAgYVCAIJCgsDFgIB - Ah4BAheAAAoJEAW1VbOEg8ZdjOsP/2ygSxH9jqffOU9SKyJDlraL2gIutqZ3B8pl - Gy/Qnb9QD1EJVb4ZxOEhcY2W9VJfIpnf3yBuAto7zvKe/G1nxH4Bt6WTJQCkUjcs - N3qPWsx1VslsAEz7bXGiHym6Ay4xF28bQ9XYIokIQXd0T2rD3/lNGxNtORZ2bKjD - vOzYzvh2idUIY1DgGWJ11gtHFIA9CvHcW+SMPEhkcKZJAO51ayFBqTSSpiorVwTq - a0cB+cgmCQOI4/MY+kIvzoexfG7xhkUqe0wxmph9RQQxlTbNQDCdaxSgwbF2T+gw - byaDvkS4xtR6Soj7BKjKAmcnf5fn4C5Or0KLUqMzBtDMbfQQihn62iZJN6ZZ/4dg - q4HTqyVpyuzMXsFpJ9L/FqH2DJ4exGGpBv00ba/Zauy7GsqOc5PnNBsYaHCply0X - 407DRx51t9YwYI/ttValuehq9+gRJpOTTKp6AjZn/a5Yt3h6jDgpNfM/EyLFIY9z - V6CXqQQ/8JRvaik/JsGCf+eeLZOw4koIjZGEAg04iuyNTjhx0e/QHEVcYAqNLhXG - rCTTbCn3NSUO9qxEXC+K/1m1kaXoCGA0UWlVGZ1JSifbbMx0yxq/brpEZPUYm+32 - o8XfbocBWljFUJ+6aljTvZ3LQLKTSPW7TFO+GXycAOmCGhlXh2tlc6iTc41PACqy - yy+mHmSv - =kkH7 - -----END PGP PUBLIC KEY BLOCK----- build_rpms: - dnf - dosfstools