tools/cockpit.spec: Adjust storaged/udisks2 dependency #7886
Conversation
|
priority as this is urgent for a downstream release. |
|
Triggered a fedora-26 test run as well, as that's a separate case. |
martinpitt
force-pushed
the
storage-deps
branch
from
7649f70
to
2ac0caa
Compare
|
Force-pushed a fix for CentOS 7, that currently behaves like RHEL 7.4. Unfortunately even the os-release trick doesn't work there, as VERSION_ID==7 there. The cleanest solution for this mess would be alternative dependencies, but AFAIK rpm doesn't support these? Or does it? |
| @@ -20,6 +20,12 @@ | |||
| %define rhel 0 | |||
| %endif | |||
|
|
|||
| # for testing this already gets set in fedora.install, as we want the target | |||
| # VERSION_ID, not the mock chroot's one | |||
There was a problem hiding this comment.
Have you seen this in any other spec file? What happens in the cockpit RPM is installed before rhel-release-server in the same transaction?
I'm worried about this. Does it make sense just to have RHEL 7.5 behavior here, and RHEL 7.4 behavior on the rhel-7-4 branch?
There was a problem hiding this comment.
What do you mean by "this"? Parsing os-release in the .spec is relatively common, e. g. systemd's spec file does that too. Our spec file also does it by default, but this doesn't work in our testsuite as that builds a RHEL package in a CentOS chroot.
I don't understand your question about install transactions -- this is purely a build-time thing, the built rpms have fixed dependencies, so OS install/upgrade orders don't matter here.
We want to be able to test current master on RHEL 7.4 (and 7.5), so we can't have the dependencies in the back-branches only. The conditional dependencies aren't new at all, they just get updated in this PR. The new thing is the more fine-grained differentiation between 7.4 and 7.5, but we have to do that somehow. Whether we do it directly in the spec or add some indirection in our build system that pre-processes the .spec.in and builds a target specific .spec doesn't matter that much, but IMHO the latter would be much more intrusive.
There was a problem hiding this comment.
I don't understand your question about install transactions -- this is purely a build-time thing, the built rpms have fixed dependencies, so OS install/upgrade orders don't matter here.
Okay perfect. If build time only then I'm fine with this.
Adjust the target OS specific dependencies of cockpit-storaged: * RHEL 7.4 and current CentOS 7 ship storaged and do not support Recommends:. * RHEL = 7.5 will only ship udisks2, which does (rightfully) not provide storaged. Still no support for Recommends:. * RHEL 8 will only ship udisks2, but does support Recommends: * Fedora 27 also moved to udisks2, earlier versions have storaged. All supported Fedora releases support Recommends:. Standard RPM macros do not allow us to differentiate between RHEL 7.4 and 7.5 (%rhel == 7), so check /etc/os-release for that. This works for "real-life" builds, but not for building on our test images as these use a CentOS 7 mock chroot for all RHEL builds. Thus do the os-release parsing in fedora.install and pass on the value as define. The udisks2 modules for lvm2 and iscsi are not yet available on RHEL 7.5, so skip these dependencies for now. Closes cockpit-project#7886
martinpitt
force-pushed
the
storage-deps
branch
from
2ac0caa
to
2993c44
Compare
|
Note: RPM 4.13 introduces a way to specify alternative dependencies, but on RHEL/CentOS 7.x we only have 4.11. So this won't be a problem any more in the future. |
Adjust the target OS specific dependencies of cockpit-storaged:
Recommends:.
provide storaged. Still no support for Recommends:.
supported Fedora releases support Recommends:.
Standard RPM macros do not allow us to differentiate between RHEL 7.4
and 7.5 (%rhel == 7), so check /etc/os-release for that. This works for
"real-life" builds, but not for building on our test images as these use
a CentOS 7 mock chroot for all RHEL builds. Thus do the os-release
parsing in fedora.install and pass on the value as define.
The udisks2 modules for lvm2 and iscsi are not yet available on RHEL
7.5, so skip these dependencies for now.