From 9ac44a5b325ce56baf73c9d5dd6844b4664ed32f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 7 Sep 2023 17:09:30 -0400 Subject: [PATCH] Drop all external repos We'll rely on what's in the distro and aim to really ship things there. --- bootc-c9s.repo | 10 ---------- bootc-fedora.repo | 11 ----------- c9s-base.yaml | 7 ------- coreos-continuous.repo | 21 --------------------- fedora.yaml | 9 +-------- oscore/bootc.yaml | 3 ++- 6 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 bootc-c9s.repo delete mode 100644 bootc-fedora.repo delete mode 100644 coreos-continuous.repo diff --git a/bootc-c9s.repo b/bootc-c9s.repo deleted file mode 100644 index 443cfb4..0000000 --- a/bootc-c9s.repo +++ /dev/null @@ -1,10 +0,0 @@ -[bootc-c9s] -name=Copr repo for bootc -baseurl=https://download.copr.fedorainfracloud.org/results/rhcontainerbot/bootc/centos-stream-9-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://download.copr.fedorainfracloud.org/results/rhcontainerbot/bootc/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 diff --git a/bootc-fedora.repo b/bootc-fedora.repo deleted file mode 100644 index b26c411..0000000 --- a/bootc-fedora.repo +++ /dev/null @@ -1,11 +0,0 @@ -[bootc-fedora] -name=Copr repo for bootc owned by rhcontainerbot -baseurl=https://download.copr.fedorainfracloud.org/results/rhcontainerbot/bootc/fedora-$releasever-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://download.copr.fedorainfracloud.org/results/rhcontainerbot/bootc/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 - diff --git a/c9s-base.yaml b/c9s-base.yaml index ac6d049..505cd6a 100644 --- a/c9s-base.yaml +++ b/c9s-base.yaml @@ -3,18 +3,11 @@ releasever: stream9 repos: - baseos - appstream - - coreos-continuous-c9s - - bootc-c9s metadata: name: c9s-oscore summary: CentOS 9 OSCore -repo-packages: - - repo: bootc-c9s - packages: - - bootc - include: - oscore/manifest.yaml diff --git a/coreos-continuous.repo b/coreos-continuous.repo deleted file mode 100644 index 75f2a9b..0000000 --- a/coreos-continuous.repo +++ /dev/null @@ -1,21 +0,0 @@ -[coreos-continuous-fedora] -name=Copr repo for continuous owned by @CoreOS -baseurl=https://download.copr.fedorainfracloud.org/results/@CoreOS/continuous/fedora-$releasever-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://download.copr.fedorainfracloud.org/results/@CoreOS/continuous/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 - -[coreos-continuous-c9s] -name=Copr repo for continuous owned by @CoreOS -baseurl=https://download.copr.fedorainfracloud.org/results/@CoreOS/continuous/centos-stream-9-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://download.copr.fedorainfracloud.org/results/@CoreOS/continuous/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 diff --git a/fedora.yaml b/fedora.yaml index f3ee24e..53eea7a 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -1,10 +1,8 @@ -releasever: 37 +releasever: 38 repos: - fedora - fedora-updates - - coreos-continuous-fedora - - bootc-fedora metadata: name: fedora-oscore @@ -14,11 +12,6 @@ include: - oscore/manifest.yaml - oscore/kernel.yaml -repo-packages: - - repo: bootc-fedora - packages: - - bootc - packages: # We include this for historical reasons - fedora-repos-ostree diff --git a/oscore/bootc.yaml b/oscore/bootc.yaml index 00bc28d..9f970d2 100644 --- a/oscore/bootc.yaml +++ b/oscore/bootc.yaml @@ -6,7 +6,8 @@ packages: # https://gitlab.com/cki-project/kernel-ark/-/commit/32271d0cd9bd52d386eb35497c4876a8f041f70b # https://src.fedoraproject.org/rpms/kernel/c/f55c3e9ed8605ff28cb9a922efbab1055947e213?branch=rawhide - linux-firmware - - bootc + # For now this will be shipped in rpm-ostree + # - bootc # Required by bootc install today, though we'll likely switch bootc to use a Rust crate instead of sgdisk - gdisk xfsprogs e2fsprogs dosfstools