From e181026981bc5824745ea723e13fb4ad9c40c89f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Oct 13 2020 17:20:49 +0000 Subject: Update ELN repos to include BaseOS and AppStream repositories Signed-off-by: Stephen Gallagher Drop the fedora-eln-modular.repo It no longer exists and the fedora-eln.repo package now contains both BaseOS and AppStream repositories for ELN. Signed-off-by: Stephen Gallagher Add ELN GPG keys Signed-off-by: Stephen Gallagher --- diff --git a/archmap b/archmap index 3a83fff..2f862a0 100644 --- a/archmap +++ b/archmap @@ -72,3 +72,5 @@ fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x + +fedora-eln-primary: i386 x86_64 aarch64 ppc64le s390x diff --git a/fedora-eln-modular.repo b/fedora-eln-modular.repo deleted file mode 100644 index 719e1e1..0000000 --- a/fedora-eln-modular.repo +++ /dev/null @@ -1,56 +0,0 @@ -# These packages are untested and still under development. This -# repository is used for development of new releases. -# -# This repository can see significant daily turnover and major -# functionality changes which cause unexpected problems with other -# development packages. Please use these packages if you want to work -# with the Fedora developers by testing these new development packages. -# -# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription -# Required) is available as a discussion forum for -# testing and troubleshooting for development packages in conjunction -# with new test releases. -# -# More information is available at http://fedoraproject.org/wiki/Testing -# -# Reproducible and reportable issues should be filed at -# http://bugzilla.redhat.com/. -# -# Product: Fedora -# Version: eln-modular - -[eln-modular] -name=Fedora - Modular ELN - Developmental modular packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular&arch=$basearch -enabled=0 -countme=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=False - -[eln-modular-debuginfo] -name=Fedora - Modular ELN - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/x86_64/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-debug&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[eln-modular-source] -name=Fedora - Modular ELN - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-source&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - diff --git a/fedora-eln.repo b/fedora-eln.repo index 0901414..7cebd9e 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -18,10 +18,46 @@ # # Product: Fedora # Version: eln +[eln-baseos] +name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=1 +countme=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=False + +[eln-baseos-debuginfo] +name=Fedora - ELN BaseOS - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + +[eln-baseos-source] +name=Fedora - ELN BaseOS - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + + -[eln] -name=Fedora - ELN - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/ +[eln-appstream] +name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch enabled=0 countme=1 @@ -32,9 +68,9 @@ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=False -[eln-debuginfo] -name=Fedora - ELN - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/x86_64/debug/tree +[eln-appstream-debuginfo] +name=Fedora - ELN AppStream - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/debug/tree #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch enabled=0 repo_gpgcheck=0 @@ -43,9 +79,9 @@ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=False -[eln-source] -name=Fedora - ELN - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/source/tree/ +[eln-appstream-source] +name=Fedora - ELN AppStream - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/source/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch enabled=0 repo_gpgcheck=0 diff --git a/fedora-repos.spec b/fedora-repos.spec index 9ac6cf9..322b734 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 33 -Release: 0.14%{?_module_build:%{?dist}} +Release: 0.15%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -18,6 +18,8 @@ Source4: fedora-updates-testing.repo Source5: fedora-rawhide.repo Source6: fedora-cisco-openh264.repo Source7: fedora-updates-archive.repo +Source8: fedora-eln.repo + Source10: RPM-GPG-KEY-fedora-7-primary Source11: RPM-GPG-KEY-fedora-8-primary @@ -75,9 +77,6 @@ Source150: RPM-GPG-KEY-fedora-iot-2019 Source151: fedora.conf Source152: fedora-compose.conf -Source200: fedora-eln.repo -Source201: fedora-eln-modular.repo - %description Fedora package repository files for yum and dnf along with gpg public keys. @@ -155,6 +154,8 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ # says "fedora-19-primary: i386 x86_64", # RPM-GPG-KEY-fedora-19-{i386,x86_64} will be symlinked to that key. pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ +# Also add a symlink for ELN keys +ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-fedora-eln-primary for keyfile in RPM-GPG-KEY*; do key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary' arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \ @@ -212,10 +213,12 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %files eln %config(noreplace) /etc/yum.repos.d/fedora-eln.repo -%config(noreplace) /etc/yum.repos.d/fedora-eln-modular.repo %changelog +* Tue Oct 13 2020 Stephen Gallagher - 33-0.15 +- Update the ELN repos for the BaseOS and AppStream split + * Mon Oct 05 2020 Dusty Mabe - 33-0.14 - Add the fedora-repos-archive subpackage.