Rebase libsolv and add epoch #863

pcreech · 2024-01-23T00:20:44Z

No description provided.

Odilhao · 2024-01-23T12:27:31Z

packages/libsolv/libsolv.spec

@@ -1,60 +1,59 @@
-%global python3_pkgversion 3.11


Do we really need to drop the python 3.11 bindings?

we probably want to keep it even :D Hence why I [wip] 'ed it

I did the initial copy over, but have not had a chance to update it to also build for python 3.11

ekohl · 2024-01-23T14:21:56Z

packages/libsolv/libsolv.spec

-* Mon Nov 20 2023 Patrick Creech <pcreech@redhat.com> - 0.7.22-6
- Obsolete python39-libsolv as well
+* Mon Jan 22 2024 Patrick Creech <pcreech@redhat.com> - 1:0.7.20-6
+- Rebase libsolv and add epoc


Suggested change

- Rebase libsolv and add epoc

- Rebase libsolv and add epoch

evgeni · 2024-01-23T15:29:03Z

packages/libsolv/libsolv.spec

-Version:        0.7.22
+Version:        0.7.20


Why are we downgrading things?

additionally: how are we going to handle EL9 which ships libsolv-0.7.24 today.

and what about https://github.com/pulp/pulp_rpm/blob/main/requirements.txt#L7 (this has been true since pulp_rpm 3.17, which is pulpcore 3.16+)

I have confirmed with pulp that while the requirements.txt for pip is 0.7.21, the functionality required should be back-ported into the OS provided libsolv. We should be able to modify that requirements.txt via spec to loosen the requirement. (it's not exactly true in a purely upstream pip installed context, hence the need for spec modificaiton).

Ideally, we should probably stop shipping libsolv on el9. Revert back to using system libsolv, and only ship 3.11 bindings for it. As far as "how", i'm not entirely sure. I need to do a little research in this space.

Yeah, if we can avoid building the lib and only do the bindings, that'd be awesome.
But the last time I looked at this, I ran away pretty quickly, as the bindings are essentially generated from the lib source and you can't build them w/o the lib (or, if you build both and only ship the bindings, who the hell guarantees that the lib from the OS and the bindings from the lib you don't ship actually match up)

Ok, so after some research and some help from fedora-devel matrix channel, we can build the python binding in a statically linked way. I played around with this locally, and it also appears to be the way solv is distributed by pypi. Therefore it won't override system libsolv, but won't use it either. Meaning we can safely decouple from system libsolv, unless we have good reason to keep it coupled.

Ah, so you build a pythonX-solv that contains a copy of libsolv but that's only used inside the Python X context? Fair

Yup :D best way out of this mess I can figure out.

pcreech · 2024-02-28T05:13:58Z

Still a little "WIP", but I think I have the strategy.

We introduce "libsolv" with an epoch, but otherwise 1-1 with system libsolv. This should fix the el8 issue. (still need to fix it to only build on el8)

We also introduce a 'python-solv' package for both el8 and el9, which provides a python3.11-solv. This should allow us to not be version locked with system libsolv, and keep us out of the game of dealing with an epoch on el9, and we can get out of this mess with libsolv when we drop el8.

packages/python-solv/python-solv.spec

evgeni · 2024-03-12T11:41:06Z

So I briefly tested the EL9 python-solv package, and besides the wrong name, it seems to have a working python solv stack, without being linked to the system libsolv. Yay.

Just to unfuck my brain, the plan is to:

On EL8
- Ship libsolv rebased on the version from EL8, but with an epoch to effectively force a downgrade from the version we currently have
- Ship python3.11-solv built from the special sauce here
On EL9
- Not ship any of the libsolv things (EL9 is newer than what we have today) [TODO: This is not what this PR does right now]
- Ship python3.11-solv built from the special sauce here

Question: Would a version like 0.7.22+really+0.7.20 for libsolv on EL8 be of any benefit (I hate epochs), as it would allow Base EL to ship a 0.7.z with z>22 that will naturally upgrade from ours, eliminating our need to keep uptodate with EL patches (as that is what we're buying here).

pcreech · 2024-03-21T15:40:29Z

Question: Would a version like 0.7.22+really+0.7.20 for libsolv on EL8 be of any benefit (I hate epochs), as it would allow Base EL to ship a 0.7.z with z>22 that will naturally upgrade from ours, eliminating our need to keep uptodate with EL patches (as that is what we're buying here).

Sadly, no. There is not a way to "upgrade" out of a module, and we are in the module at this point. I'm not a fan of epochs either, but this is kinda the reason they exist in RPM land, and translate better. We will never "upgrade" out of this state sadly.

Currently fleshing out the small updates, should be g2g soon

pcreech · 2024-03-21T15:46:59Z

4051d18 will need to be removed once we are ready to merge. This commit is only to bypass the version/release check that keeps failing due to rebasing on a new version/release with epoc. It really doesn't like the release for some reason.

Odilhao · 2024-03-21T15:56:25Z

[rpm-copr test]

evgeni

python3-solv is still in the el9 comos, but should not?

There's got to be a way around this error

evgeni · 2024-04-12T09:29:18Z

[test rpm-copr] as I have no idea why it failed and the logs are gone

evgeni · 2024-04-12T09:30:28Z

el9 comps still contain ruby-solv and python3-solv.

evgeni · 2024-04-12T09:40:46Z

aha, building libsolv on EL8 fails: error: line 145: Unknown tag: %python_provide: ERROR: python3-solv not recognized.

pcreech · 2024-04-15T14:45:52Z

This PR will be superseded by two other PRs breaking the individual items apart.

python-solv - #938
libsolv - {}

Odilhao · 2024-07-31T15:57:35Z

Can we close this @pcreech ?

pcreech changed the title ~~Rebase libsolv and add epoch~~ [WIP] Rebase libsolv and add epoch Jan 23, 2024

Odilhao reviewed Jan 23, 2024

View reviewed changes

ekohl reviewed Jan 23, 2024

View reviewed changes

evgeni reviewed Jan 23, 2024

View reviewed changes

evgeni mentioned this pull request Feb 27, 2024

enable upgrade pipelines for katello on el9 theforeman/jenkins-jobs#423

Merged

3 tasks

pcreech force-pushed the libsolv-epoc branch 15 times, most recently from e488998 to 3f8055a Compare February 28, 2024 04:52

pcreech added 2 commits February 27, 2024 23:59

Build python-solv

87fdacf

Rebase libsolv and add epoch

eae5269

pcreech force-pushed the libsolv-epoc branch from 3f8055a to bffd875 Compare February 28, 2024 04:59

evgeni reviewed Mar 12, 2024

View reviewed changes

packages/python-solv/python-solv.spec Outdated Show resolved Hide resolved

pcreech force-pushed the libsolv-epoc branch from 0cb75c8 to 5c7fb0c Compare March 21, 2024 15:34

pcreech added 2 commits March 21, 2024 11:45

Use python3_pkgversion in name

855b5eb

Remove libsolv from el9 comps

46fee9d

pcreech force-pushed the libsolv-epoc branch from 6bfde0f to 4051d18 Compare March 21, 2024 15:45

pcreech changed the title ~~[WIP] Rebase libsolv and add epoch~~ Rebase libsolv and add epoch Mar 21, 2024

pcreech force-pushed the libsolv-epoc branch 2 times, most recently from 202a039 to 4051d18 Compare March 21, 2024 19:12

evgeni requested changes Mar 21, 2024

View reviewed changes

pr-processor bot added the Waiting on contributor label Mar 21, 2024

ERROR=Reset relesae to bypass version/release check.

25761e0

There's got to be a way around this error

pcreech force-pushed the libsolv-epoc branch from 4051d18 to 25761e0 Compare March 21, 2024 19:24

Random testing

d8b34ff

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase libsolv and add epoch #863

Rebase libsolv and add epoch #863

pcreech commented Jan 23, 2024

Odilhao Jan 23, 2024

pcreech Jan 23, 2024

ekohl Jan 23, 2024

evgeni Jan 23, 2024

evgeni Feb 20, 2024

evgeni Feb 20, 2024 •

edited

Loading

pcreech Feb 20, 2024

evgeni Feb 20, 2024

pcreech Feb 20, 2024

evgeni Feb 20, 2024

pcreech Feb 20, 2024

pcreech commented Feb 28, 2024

evgeni commented Mar 12, 2024

pcreech commented Mar 21, 2024

pcreech commented Mar 21, 2024

Odilhao commented Mar 21, 2024

evgeni left a comment

evgeni commented Apr 12, 2024

evgeni commented Apr 12, 2024

evgeni commented Apr 12, 2024

pcreech commented Apr 15, 2024

Odilhao commented Jul 31, 2024

		Version: 0.7.22
		Version: 0.7.20

Rebase libsolv and add epoch #863

Are you sure you want to change the base?

Rebase libsolv and add epoch #863

Conversation

pcreech commented Jan 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

evgeni Feb 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pcreech commented Feb 28, 2024

evgeni commented Mar 12, 2024

pcreech commented Mar 21, 2024

pcreech commented Mar 21, 2024

Odilhao commented Mar 21, 2024

evgeni left a comment

Choose a reason for hiding this comment

evgeni commented Apr 12, 2024

evgeni commented Apr 12, 2024

evgeni commented Apr 12, 2024

pcreech commented Apr 15, 2024

Odilhao commented Jul 31, 2024

evgeni Feb 20, 2024 •

edited

Loading