Skip to content

Commit

Permalink
manifest: switch to Fedora 33
Browse files Browse the repository at this point in the history
This also includes updating the `fedora` repo URL to the development
location and enabling the `fedora-updates-testing` repo for now while
we are still in development. We also add back in the modular repos,
which were split out into a subpackage in Fedora 33.

Fixes coreos/fedora-coreos-tracker#611
  • Loading branch information
dustymabe committed Sep 24, 2020
1 parent 9538689 commit c12282c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions fedora.repo
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
[fedora]
name=Fedora $releasever - $basearch
failovermethod=priority
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
# https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
enabled=1
#metadata_expire=7d
Expand Down
3 changes: 2 additions & 1 deletion manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ref: fedora/${basearch}/coreos/next-devel
include: manifests/fedora-coreos.yaml

releasever: "32"
releasever: "33"

rojig:
license: MIT
Expand All @@ -14,6 +14,7 @@ repos:
# still pinned
- fedora
- fedora-updates
- fedora-updates-testing

# All Fedora CoreOS streams share the same pool for locked files.
# This will be in fedora-coreos.yaml in the future so it can be more easily be
Expand Down
3 changes: 3 additions & 0 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ packages:
- jq
# nvme-cli for managing nvme disks
- nvme-cli
# fedora-repos-modular was converted into its own subpackage in f33
# Continue to include it in case users want to use it.
- fedora-repos-modular

# This thing is crying out to be pulled into systemd, but that hasn't happened
# yet. Also we may want to add to rpm-ostree something like arch negation;
Expand Down

0 comments on commit c12282c

Please sign in to comment.