From 1ed94bba5e880bbae7ab86482cf1e053593fdf98 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Oct 06 2020 19:28:25 +0000
Subject: Add the fedora-repos-archive subpackage.


This should aid our efforts to make package layering more reliable in
OSTree based Editions. See:

- https://github.com/coreos/fedora-coreos-tracker/issues/400
- https://github.com/coreos/fedora-coreos-tracker/issues/401
- https://pagure.io/releng/issue/9717
- https://lists.fedoraproject.org/archives/list/iot@lists.fedoraproject.org/thread/QZFVKH2SMHJNIZS2M4U25CHJOZXIKLWG/

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
(cherry picked from commit 51f622a8ca8faa70e5405968e10355c6104d457a)

---

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 9c532ec..740fff5 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        32
-Release:        6%{?_module_build:%{?dist}}
+Release:        7%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -19,6 +19,7 @@ Source3:        fedora-updates.repo
 Source4:        fedora-updates-testing.repo
 Source5:        fedora-rawhide.repo
 Source6:        fedora-cisco-openh264.repo
+Source7:        fedora-updates-archive.repo
 
 Source10:       RPM-GPG-KEY-fedora-7-primary
 Source11:       RPM-GPG-KEY-fedora-8-primary
@@ -89,6 +90,15 @@ Obsoletes:      fedora-release-rawhide <= 22-0.3
 Obsoletes:      fedora-repos-rawhide-modular < 29-0.6
 Provides:       fedora-repos-rawhide-modular = %{version}-%{release}
 
+%package archive
+Summary:        Fedora updates archive package repository
+Requires:       fedora-repos = %{version}-%{release}
+
+%description archive
+This package provides the repo definition for the updates archive repo.
+It is a package repository that contains any RPM that has made it to
+stable in Bodhi and been available in the Fedora updates repo in the past.
+
 %description rawhide
 This package provides the rawhide repo definitions.
 
@@ -168,6 +178,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
 
+%files archive
+%config(noreplace) /etc/yum.repos.d/fedora-updates-archive.repo
+
 %files rawhide
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
@@ -189,6 +202,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %changelog
+* Mon Oct 05 2020 Dusty Mabe <dusty@dustymabe.com> - 32-7
+- Add the fedora-repos-archive subpackage.
+
 * Tue Aug 25 2020 Adam Williamson <awilliam@redhat.com> - 32-6
 - Add missing per-arch symlinks for F34 key
 
diff --git a/fedora-updates-archive.repo b/fedora-updates-archive.repo
new file mode 100644
index 0000000..0a66fd1
--- /dev/null
+++ b/fedora-updates-archive.repo
@@ -0,0 +1,22 @@
+# This is a repo that contains all the old update packages from the
+# Fedora updates yum repository (i.e. the packages that have made it
+# to "stable"). This repo is needed for OSTree based systems where users
+# may be trying to layer packages on top of a base layer that doesn't
+# have the latest stable content. Since base layer content is locked
+# the package layering operation will fail unless there are older versions
+# of packages available.
+#
+# This repo is given a high cost in order to prefer the normal Fedora
+# yum repositories, which means only packages that can't be found
+# elsewhere will be downloaded from here.
+[updates-archive]
+name=Fedora $releasever - $basearch - Updates Archive
+baseurl=https://fedoraproject-updates-archive.fedoraproject.org/fedora/$releasever/$basearch/
+enabled=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=True
+cost=10000 # default is 1000