Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

configs: ELN fixups #649

Merged
merged 1 commit into from
Oct 26, 2020
Merged

configs: ELN fixups #649

merged 1 commit into from
Oct 26, 2020

Conversation

mmathesius
Copy link
Contributor

  • align repo configuration with fedora-repos-eln by switching to BaseOS and
    AppStream instead of Everything
  • use keys from fedora-gpg-keys rather than distribution-gpg-keys
  • use explicit list of buildroot packages to install rather than comps group
  • drop support for ARM

xsuchy
xsuchy reviewed Oct 19, 2020
View reviewed changes
mock-core-configs/etc/mock/templates/fedora-eln.tpl Outdated
enabled=1
repo_gpgcheck=0
type=rpm
gpgcheck=1
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-rawhide-primary
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We must be sure that this file exists on user machine (be it Fedora, Suse, CentOS). Please add the key to https://github.com/xsuchy/distribution-gpg-keys/ and then use the key from /usr/share/distribution-gpg-keys/* directory.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the keys to https://github.com/xsuchy/distribution-gpg-keys/tree/master/keys/fedora-eln and I will do a release this evening.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xsuchy Thanks. I'll submit an update to this PR after that release has been done.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xsuchy FYI, the Fedora ELN keys are (and should continue to be) the same as the current Fedora Rawhide keys.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mmathesius Hmm then why the change? What is wrong on gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-rawhide-primary then?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xsuchy Two reasons. The first is that RPM-GPG-KEY-fedora-rawhide-primary was pointing to the F33 key until your commit a few minutes ago! The second is that I just slurped in the contents of the Fedora ELN repo configuration from https://src.fedoraproject.org/rpms/fedora-repos/blob/master/f/fedora-eln.repo which points to the revised location.

Now that rawhide points to F34, I can revert gpgkey to be what you suggested above. Is that what you'd prefer?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just pushed an update setting gpgkey to point to the Rawhide primary key. I tested by manually updated the /usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-rawhide-primary symlink on my workstation to point to RPM-GPG-KEY-fedora-34-primary and all is good.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that what you'd prefer?

Yes, please.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that what you'd prefer?

Yes, please.

@xsuchy Great! That's what I included in e1736a4.

Thank you for the feedback. Is there anything else?

@mmathesius
configs: ELN fixups
e1736a4 
- align repo configuration with fedora-repos-eln by switching to BaseOS and
  AppStream instead of Everything
- use explicit list of buildroot packages to install rather than comps group
- drop support for ARM

Signed-off-by: Merlin Mathesius <[email protected]>
@mmathesius
Copy link
Contributor Author

@xsuchy Are there any other changes/improvements you'd like to see with this? Thanks!

@jkonecny12 jkonecny12 mentioned this pull request Oct 22, 2020
Merged
@xsuchy
Copy link
Member

xsuchy commented Oct 22, 2020

LGTM, but I will let @praiskup to merge this once he returns from PTO on Monday.

@praiskup
Copy link
Member

It is interesting to see that ELN can live just with the appstream and baseos (no need for "optional" or "build-time-only" repo).

@praiskup
Copy link
Member

Thank you for the PR!

@praiskup praiskup merged commit 8835b00 into rpm-software-management:master Oct 26, 2020
@hroncok
Copy link
Contributor

hroncok commented Oct 27, 2020 •
edited
Loading

I've updated to this configuration with mock-2.6-1.fc33 and mock-core-configs-33-1.fc33. (With the previous configuration I got a problem with the missing buildsys-build group.)

I run:

$ mock -r fedora-eln-x86_64 --scrub=all
$ mock -r fedora-eln-x86_64 init

And I get:

No match for argument: fedora-release-eln
No match for argument: glibc-minimal-langpack

@hroncok hroncok mentioned this pull request Oct 28, 2020
Closed
@praiskup
Copy link
Member

I only see:

No match for argument: glibc-minimal-langpack
Error: Unable to find a match: glibc-minimal-langpack
ERROR: Command failed:

@mmathesius is this going to be fixed soon?

@mmathesius
Copy link
Contributor Author

@mmathesius is this going to be fixed soon?

It's a problem that appeared with the ELN compose. fedora-release-eln was resolved yesterday. glibc-minimal-langpack is being looked into by @sgallagher and @jwboyer.

@mmathesius
Copy link
Contributor Author

The missing glibc-minimal-langpack problem should be fixed by https://pagure.io/pungi-fedora/pull-request/931. (Thanks @jwboyer!)

@mmathesius
Copy link
Contributor Author

glibc-minimal-langpack is back in the ELN BaseOS repo. This should be resolved. Again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xsuchy xsuchy xsuchy left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mmathesius @xsuchy @praiskup @hroncok