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.

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

Convert %prep into a regular build scriptlet #2730

Merged
merged 6 commits into from
Oct 27, 2023

Conversation

pmatilai
Copy link
Member

@pmatilai pmatilai commented Oct 23, 2023

This is a fun little series. Details in the commit messages, but briefly:

  • Implement support for auxiliary macros, ie macros implemented in C outside the macro engine itself. Some renames + API exports required for this.
  • Turn the deprecated %patchN into a hard error, this is the sacrificial lamb of this change 🐑
  • Finally, convert %prep into a regular build scriptlet 🥳

Fixes: #2205

This is just in preparation for exposing the handle in some APIs.
No functional changes.
Just preparing to export in the next steps. No functional changes.
Add rpmPushMacroAux() function which allows registering auxiliary macros
implemented in C and some required helper facilities: export the types,
rpmMacroBufAppend*() and rpmMacroBufErr() functions, and finally
add rpmMacroEntryPriv() to let macro retrieve their private data.
And that's all folks.
This stupid syntax is the thing preventing %prep from becoming a normal
script, and that in turn blocks so many things now that this has got to
go.

Considering how widely used this syntax is, this is a disruptive
and abrupt change - we only started warning on %patchN in 4.18. So lets
at least print out a legible error message with suggestions how to fix
for now, even if it requires specifically checking for the obsolete
syntax.
Now that we can, implement %setup and %patch as auxiliary macros that are
defined only during %prep parsing. And voila, %prep is no longer special
at all. Not much anyhow.

Notably rpmspec --parse now emits %build where it belongs.
The error message on %patchN is now very much an ugly hack, but at least
it's something we can drop one sunny day.

Fixes: rpm-software-management#2205
@pmatilai
Copy link
Member Author

Technically, it'd still be possible to convert %patchN to %patch N, we'd just need to do it in specExpand() or other such place that has no clue about the current section. The risk of doing so seems quite minimal, but I'd just rather not. OTOH if axing support for %patchN turns out to be too controversial, we do have a plan B that doesn't require reverting this change and everything built on top of it.

@ffesti
Copy link
Contributor

ffesti commented Oct 26, 2023

Looks actually quite nice and surprisingly straight forward.

I wonder if we should do an announcement if we really want to drop %patchN so distributions have a bit more time to prepare.

@pmatilai
Copy link
Member Author

Yeah, after all the years of refactoring the final piece doesn't actually look like much 😆

We're already issuing deprecation warnings from 4.18 and 4.19, so when 4.20 lands in the first distros sometime next year it wont come out of the great big blue, but sure, banging some drums (more loudly) would be appropriate.

@pmatilai
Copy link
Member Author

So... if we're going to do this then lets just get on with it, because this is blocking or at least affecting so many other developments at this point. Like noted, if this turns out to be an utter PR disaster (in the other meaning of PR), it'll still be possible to add a different kind of hack to restore %patchN for one release more.

@pmatilai pmatilai merged commit 064ba64 into rpm-software-management:master Oct 27, 2023
1 check passed
@pmatilai pmatilai deleted the aux-pr branch October 27, 2023 07:08
@pmatilai pmatilai added the packaging Package building, SPEC files, etc. label Mar 22, 2024
@dmnks dmnks added changed Change in functionality and removed cleanup labels Mar 22, 2024
@dmnks dmnks changed the title Convert %prep into a regular build scriptlet Convert %prep into a regular build scriptlet Mar 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changed Change in functionality packaging Package building, SPEC files, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Turn %prep into a normal build script
3 participants