From 75c4965470a9776ad359e9983ae46ff47b5a2db9 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 30 Apr 2020 11:44:59 -0400 Subject: [PATCH] Add overrides for multi-arch With https://github.com/coreos/fedora-coreos-config/pull/355, the pool is now used for fetching lockfiles only. This however broke multi-arch builds because although there are no lockfiles, it's currently not possible to get a depsolve without at least locking crypto-policies: https://github.com/coreos/fedora-coreos-config/pull/335#issuecomment-610634917 While we can't yet maintain base lockfiles for other arches, we can at least start maintaining overrides. This will also in the process fix multi-arch builds. --- manifest-lock.overrides.aarch64.yaml | 28 ++++++++++++++++++++++++++++ manifest-lock.overrides.ppc64le.yaml | 28 ++++++++++++++++++++++++++++ manifest-lock.overrides.s390x.yaml | 28 ++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 manifest-lock.overrides.aarch64.yaml create mode 100644 manifest-lock.overrides.ppc64le.yaml create mode 100644 manifest-lock.overrides.s390x.yaml diff --git a/manifest-lock.overrides.aarch64.yaml b/manifest-lock.overrides.aarch64.yaml new file mode 100644 index 0000000000..65430663b5 --- /dev/null +++ b/manifest-lock.overrides.aarch64.yaml @@ -0,0 +1,28 @@ +packages: + # crypto-policies without python dependencies + # We're pulling from f32 here as this is a brand new change + # and the maintainer is not comfortable sending it to F31 yet. + # https://src.fedoraproject.org/rpms/crypto-policies/pull-request/6#comment-35958 + crypto-policies: + evra: 20191128-5.gitcd267a5.fc32.noarch + # Cherry-pick rpm-ostree git snapshot to resolve issues with /read-only + # sysroot. We can nuke this when we cut a new release. + # https://github.com/coreos/fedora-coreos-tracker/issues/343 + rpm-ostree: + evra: 2020.1.21.ge9011530-2.fc31.aarch64 + rpm-ostree-libs: + evra: 2020.1.21.ge9011530-2.fc31.aarch64 + # Hold back fedora-release-common rpm because of lua script + # https://github.com/coreos/fedora-coreos-tracker/issues/459 + fedora-release-common: + evra: 31-2.noarch + fedora-release-coreos: + evra: 31-2.noarch + # Hold back moby engine. It has been bumped to 19.03 in stable. + # This is a major version bump we need to consider. + moby-engine: + evra: 18.09.8-2.ce.git0dd43dd.fc31.aarch64 + # Fast track new Ignition with more networking fixes + # https://bodhi.fedoraproject.org/updates/FEDORA-2020-0a3fdd111c + ignition: + evra: 2.2.1-5.git2d3ff58.fc31.aarch64 diff --git a/manifest-lock.overrides.ppc64le.yaml b/manifest-lock.overrides.ppc64le.yaml new file mode 100644 index 0000000000..e490fa542c --- /dev/null +++ b/manifest-lock.overrides.ppc64le.yaml @@ -0,0 +1,28 @@ +packages: + # crypto-policies without python dependencies + # We're pulling from f32 here as this is a brand new change + # and the maintainer is not comfortable sending it to F31 yet. + # https://src.fedoraproject.org/rpms/crypto-policies/pull-request/6#comment-35958 + crypto-policies: + evra: 20191128-5.gitcd267a5.fc32.noarch + # Cherry-pick rpm-ostree git snapshot to resolve issues with /read-only + # sysroot. We can nuke this when we cut a new release. + # https://github.com/coreos/fedora-coreos-tracker/issues/343 + rpm-ostree: + evra: 2020.1.21.ge9011530-2.fc31.ppc64le + rpm-ostree-libs: + evra: 2020.1.21.ge9011530-2.fc31.ppc64le + # Hold back fedora-release-common rpm because of lua script + # https://github.com/coreos/fedora-coreos-tracker/issues/459 + fedora-release-common: + evra: 31-2.noarch + fedora-release-coreos: + evra: 31-2.noarch + # Hold back moby engine. It has been bumped to 19.03 in stable. + # This is a major version bump we need to consider. + moby-engine: + evra: 18.09.8-2.ce.git0dd43dd.fc31.ppc64le + # Fast track new Ignition with more networking fixes + # https://bodhi.fedoraproject.org/updates/FEDORA-2020-0a3fdd111c + ignition: + evra: 2.2.1-5.git2d3ff58.fc31.ppc64le diff --git a/manifest-lock.overrides.s390x.yaml b/manifest-lock.overrides.s390x.yaml new file mode 100644 index 0000000000..0e88e0fd70 --- /dev/null +++ b/manifest-lock.overrides.s390x.yaml @@ -0,0 +1,28 @@ +packages: + # crypto-policies without python dependencies + # We're pulling from f32 here as this is a brand new change + # and the maintainer is not comfortable sending it to F31 yet. + # https://src.fedoraproject.org/rpms/crypto-policies/pull-request/6#comment-35958 + crypto-policies: + evra: 20191128-5.gitcd267a5.fc32.noarch + # Cherry-pick rpm-ostree git snapshot to resolve issues with /read-only + # sysroot. We can nuke this when we cut a new release. + # https://github.com/coreos/fedora-coreos-tracker/issues/343 + rpm-ostree: + evra: 2020.1.21.ge9011530-2.fc31.s390x + rpm-ostree-libs: + evra: 2020.1.21.ge9011530-2.fc31.s390x + # Hold back fedora-release-common rpm because of lua script + # https://github.com/coreos/fedora-coreos-tracker/issues/459 + fedora-release-common: + evra: 31-2.noarch + fedora-release-coreos: + evra: 31-2.noarch + # Hold back moby engine. It has been bumped to 19.03 in stable. + # This is a major version bump we need to consider. + moby-engine: + evra: 18.09.8-2.ce.git0dd43dd.fc31.s390x + # Fast track new Ignition with more networking fixes + # https://bodhi.fedoraproject.org/updates/FEDORA-2020-0a3fdd111c + ignition: + evra: 2.2.1-5.git2d3ff58.fc31.s390x