rpms / epel-release

Clone
Source Code
GIT

#4 Add modular repos for epel8
Merged 2 years ago by mohanboddu. Opened 2 years ago by merlinm.
rpms/ merlinm/epel-release epel8-modular  into  epel8

file added
+23 
@@ -0,0 +1,23 @@ 
 

+ [epel-modular]
 

+ name=Extra Packages for Enterprise Linux Modular $releasever - $basearch
 

+ #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch
 

+ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 

+ enabled=1
 

+ gpgcheck=1
 

+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 

+ 

+ [epel-modular-debuginfo]
 

+ name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug
 

+ #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch/debug
 

+ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 

+ enabled=0
 

+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 

+ gpgcheck=1
 

+ 

+ [epel-modular-source]
 

+ name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source
 

+ #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/SRPMS
 

+ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 

+ enabled=0
 

+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 

+ gpgcheck=1

file modified
+9 -3 
@@ -1,6 +1,6 @@ 
 

  Name:           epel-release
 

  Version:        8
 

- Release:        7%{dist}
 

+ Release:        8%{dist}
 

  Summary:        Extra Packages for Enterprise Linux repository configuration
 

  

  Group:          System Environment/Base
 
@@ -14,11 +14,14 @@ 
 

  Source1:        GPL
 

  Source2:        epel.repo
 

  Source3:        epel-testing.repo
 

- Source4:	epel-playground.repo
 

+ Source4:        epel-playground.repo
 

  # EPEL default preset policy (borrowed from fedora's 90-default.preset)
 

  Source5:        90-epel.preset
 

  Source6:        README-epel-8-packaging.md
 

  

+ Source100:      epel-modular.repo
 

+ Source101:      epel-testing-modular.repo
 

+ 

  BuildArch:     noarch
 

  Requires:      redhat-release >=  %{version}
 

  # epel-release is only for enterprise linux, not fedora
 
@@ -46,7 +49,7 @@ 
 

  

  # yum
 

  install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 

- install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 

+ install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \
 

      $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 

  install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset
 

  
@@ -61,6 +64,9 @@ 
 

  %{_prefix}/lib/systemd/system-preset/90-epel.preset
 

  

  %changelog
 

+ * Fri Dec 13 2019 Merlin Mathesius <mmathesi@redhat.com> - 8-8%{dist}
 

+ - Add modular repos.
 

+ 

  * Thu Oct 10 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-7%{dist}
 

  - Remove failovermethod from EPEL8 tree. It is no longer needed.

file added
+23 
@@ -0,0 +1,23 @@ 
 

+ [epel-testing-modular]
 

+ name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch
 

+ #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch
 

+ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 

+ enabled=0
 

+ gpgcheck=1
 

+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 

+ 

+ [epel-testing-modular-debuginfo]
 

+ name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug
 

+ #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch/debug
 

+ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 

+ enabled=0
 

+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 

+ gpgcheck=1
 

+ 

+ [epel-testing-modular-source]
 

+ name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source
 

+ #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/SRPMS
 

+ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 

+ enabled=0
 

+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 

+ gpgcheck=1

Updates to enable the new epel8 modular repos.

rebased onto feaacb8
2 years ago

Note: the repo file for epel-playground-modular is included here, but not installed by the spec file until modular EPEL8 playground gets sorted out and deployed to production.

Note: the repo file for epel-playground-modular is included here, but not installed by the spec file until modular EPEL8 playground gets sorted out and deployed to production.

May be we should not even add it now.

And only provide it from epel8-playground.

cc @smooge @sgallagh
Edited 2 years ago by mohanboddu

@mohanboddu

May be we should not even add it now.
And only provide it from epel8-playground.
cc @smooge @sgallagh

I included it because the repo file for epel-playground is already included--but not installed.

@mohanboddu But more to your point, I agree the epel-playground-modular repo file should never be installed by this package.

rebased onto 26af6a9
2 years ago

My latest push completely drops the epel-playground-modular.repo file I had included earlier.

@mohanboddu @smooge @kevin I have noted that using the metalink URL present in my added epel-modular.repo file does not currently work. However, if I comment that out and uncomment the baseurl line, it does work. So, do I have the metalink URL correct? Or has that just not been enabled yet?

There are no modular repositories for epel in MirrorManager. Please open a fedora-infrastructure ticket to track that.

:information_source: https://pagure.io/fedora-infrastructure/issue/8469 has been opened to track adding the epel8 modular repos to MirrorManager

@mohanboddu There's no need to rebase. Those are the exact names I already used in the metalink URLs.

And, it looks like the names are live now in MirrorManager. The following is what I see after installing a scratch build of this update (https://koji.fedoraproject.org/koji/taskinfo?taskID=39694345) on a CentOS 8 system.

$ dnf --refresh --enablerepo={epel-modular,epel-modular-debuginfo,epel-modular-source,epel-testing-modular,epel-testing-modular-debuginfo,epel-testing-modular-source} repolist
CentOS-8 - AppStream                                                                                1.7 kB/s | 4.3 kB     00:02    
CentOS-8 - Base                                                                                     8.2 kB/s | 3.9 kB     00:00    
CentOS-8 - Extras                                                                                   992  B/s | 1.5 kB     00:01    
CentOS-8 - PowerTools                                                                                17 kB/s | 4.3 kB     00:00    
Extra Packages for Enterprise Linux Modular 8 - x86_64                                               15 kB/s |  19 kB     00:01    
Extra Packages for Enterprise Linux Modular 8 - x86_64 - Debug                                       95 kB/s |  17 kB     00:00    
Extra Packages for Enterprise Linux Modular 8 - x86_64 - Source                                      82 kB/s |  17 kB     00:00    
Extra Packages for Enterprise Linux Modular 8 - Testing - x86_64                                     91 kB/s |  18 kB     00:00    
Extra Packages for Enterprise Linux Modular 8 - Testing - x86_64 - Debug                             73 kB/s |  18 kB     00:00    
Extra Packages for Enterprise Linux Modular 8 - Testing - x86_64 - Source                            61 kB/s |  19 kB     00:00    
Extra Packages for Enterprise Linux 8 - x86_64                                                       93 kB/s |  21 kB     00:00    
repo id                                  repo name                                                                            status
AppStream                                CentOS-8 - AppStream                                                                 5,089
BaseOS                                   CentOS-8 - Base                                                                      2,843
PowerTools                               CentOS-8 - PowerTools                                                                1,507
epel                                     Extra Packages for Enterprise Linux 8 - x86_64                                       3,679
epel-modular                             Extra Packages for Enterprise Linux Modular 8 - x86_64                                   0
epel-modular-debuginfo                   Extra Packages for Enterprise Linux Modular 8 - x86_64 - Debug                           0
epel-modular-source                      Extra Packages for Enterprise Linux Modular 8 - x86_64 - Source                          0
epel-testing-modular                     Extra Packages for Enterprise Linux Modular 8 - Testing - x86_64                         0
epel-testing-modular-debuginfo           Extra Packages for Enterprise Linux Modular 8 - Testing - x86_64 - Debug                 0
epel-testing-modular-source              Extra Packages for Enterprise Linux Modular 8 - Testing - x86_64 - Source                0
extras                                   CentOS-8 - Extras                                                                        3
$

Pull-Request has been merged by mohanboddu
2 years ago
Metadata
None
No Tags
Changes Summary 3
+23
file added
epel-modular.repo
+9 -3
file changed
epel-release.spec
+23
file added
epel-testing-modular.repo
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.