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

%setup%autosetup -N unless -aN -aM #93

Merged
merged 3 commits into from
Oct 9, 2020

Conversation

TomasTomecek
Copy link
Member

Sometimes packages have multiple sources (= archives) which they unpack
during %prep in different ways. This can be done with %setup -aN -aM.
Sadly %autosetup -aN -aM does not work: https://bugzilla.redhat.com/show_bug.cgi?id=1881840

So we need to turn back into overwriting %setup unless we detect this
use case.

But the eternal problem with patches applied in a subdir persists.

Fixes some of #92

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

Sometimes packages have multiple sources (= archives) which they unpack
during %prep in different ways. This can be done with `%setup -aN -aM`.
Sadly `%autosetup -aN -aM` does not work: https://bugzilla.redhat.com/show_bug.cgi?id=1881840

So we need to turn back into overwriting %setup unless we detect this
use case.

But the eternal problem with patches applied in a subdir persists.

Fixes some of packit#92

Signed-off-by: Tomas Tomecek <[email protected]>
%setup -T means that rpm should not unpack source0 - if we turn %setup
into %autosetup thus getting a git repo after running it, we'll get an
empty git repo - bad. These cases usually unpack/construct the source
tree in %prep in a custom way. It would result into first patch
containing the whole source tree - we don't want that.

With this change, we'll create the git repo before applying first patch
which should match the initial source tree.

I hope it's clear we are getting into depths of odd packaging

Related packit#85

Signed-off-by: Tomas Tomecek <[email protected]>
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@TomasTomecek TomasTomecek added the mergeit When set, zuul wil gate and merge the PR. label Oct 8, 2020
Copy link
Member

@lachmanfrantisek lachmanfrantisek left a comment

Choose a reason for hiding this comment

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

Thanks for the explanation.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 0f8b674 into packit:master Oct 9, 2020
@TomasTomecek TomasTomecek deleted the 92 branch October 9, 2020 07:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mergeit When set, zuul wil gate and merge the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants