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

Makefile: package -> rpm #19214

Merged
merged 1 commit into from
Jul 13, 2023
Merged

Makefile: package -> rpm #19214

merged 1 commit into from
Jul 13, 2023

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Jul 12, 2023 •
edited
Loading

package and package-install targets have been renamed to rpm and rpm-install respectively for clarity.

make rpm will now build rpm using HEAD.

Does this PR introduce a user-facing change?

The Makefile `package` and `package-install` targets have been renamed to `rpm` and `rpm-install` respectively. `rpm-install` needs to be run as root.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 12, 2023
@lsm5
Copy link
Member Author

lsm5 commented Jul 12, 2023

@edsantiago @mheon @ashley-cui @Luap99 @vrothberg PTAL

@lsm5 lsm5 force-pushed the package-rpm-rename branch from 5584460 to be914ce Compare July 12, 2023 18:38
@lsm5 lsm5 linked an issue Jul 12, 2023 that may be closed by this pull request
Built attempt fails with errors | Fedora #18817
Closed
@lsm5 lsm5 force-pushed the package-rpm-rename branch from be914ce to a0673f4 Compare July 12, 2023 18:40
@lsm5
Copy link
Member Author

lsm5 commented Jul 12, 2023

@rhatdan PTAL

@lsm5
Copy link
Member Author

lsm5 commented Jul 12, 2023

I think sudo should be removed from the rpm-install target as well, and let the user handle it

@lsm5 lsm5 force-pushed the package-rpm-rename branch from a0673f4 to b3c6ec8 Compare July 12, 2023 19:05
@lsm5 lsm5 mentioned this pull request Jul 12, 2023
Merged
@rhatdan
Copy link
Member

rhatdan commented Jul 12, 2023

LGTM

@lsm5
Copy link
Member Author

lsm5 commented Jul 12, 2023

git-archive-all is not available on centos stream and rhel. I'll need to replace it with git archive... Updating...

@lsm5 lsm5 marked this pull request as draft July 12, 2023 19:48
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 12, 2023
@lsm5 lsm5 force-pushed the package-rpm-rename branch from b3c6ec8 to 44fde5a Compare July 12, 2023 20:04
@lsm5 lsm5 marked this pull request as ready for review July 12, 2023 20:04
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 12, 2023
edsantiago
edsantiago reviewed Jul 12, 2023
View reviewed changes
Copy link
Member

@edsantiago edsantiago left a comment

Choose a reason for hiding this comment

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

LGTM, one nit

rpm/update-spec-version.sh Outdated
Comment on lines 20 to 22
cd ..
git archive --prefix=$PACKAGE-$GIT_DESCRIBE/ HEAD -o rpm/$PACKAGE-$GIT_DESCRIBE.tar.gz
cd rpm
Copy link
Member

Choose a reason for hiding this comment

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

That final line is a NOP, causing the reader to waste time wondering why it's there. Should you need to repush for another reason (this one isn't a blocker), I would recommend

(cd .. && git archive ....)

(open paren, cd .., same archive command, close paren). git -C would work too but then I think the rpm/PATH is less clear.

Copy link
Member Author

Choose a reason for hiding this comment

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

done. I also added a --format=tar.gz . PTAL

TomSweeneyRedHat
TomSweeneyRedHat reviewed Jul 13, 2023
View reviewed changes
Copy link
Member

@TomSweeneyRedHat TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

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

Other than @edsantiago 's nit, LGTM

@lsm5
Makefile: package -> rpm
315a788 
package and package-install targets have been renamed
to rpm and rpm-install respectively for clarity.

`make rpm` will now build rpm using HEAD.

Resolves: containers#18817

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the package-rpm-rename branch from 44fde5a to 315a788 Compare July 13, 2023 12:45
@lsm5 lsm5 mentioned this pull request Jul 13, 2023
Closed
@edsantiago
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 13, 2023
@openshift-merge-robot openshift-merge-robot merged commit 285665f into containers:main Jul 13, 2023
@lsm5
Copy link
Member Author

lsm5 commented Jul 13, 2023

/cherry-pick v4.6

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 13, 2023
Merged
@openshift-cherrypick-robot
Copy link
Collaborator

@lsm5: new pull request created: #19226

In response to this:

/cherry-pick v4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@lsm5 lsm5 deleted the package-rpm-rename branch September 21, 2023 13:27
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Dec 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@TomSweeneyRedHat TomSweeneyRedHat TomSweeneyRedHat left review comments

@edsantiago edsantiago edsantiago left review comments

Assignees

@edsantiago edsantiago

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Built attempt fails with errors | Fedora
6 participants
@lsm5 @rhatdan @edsantiago @openshift-cherrypick-robot @TomSweeneyRedHat @openshift-merge-robot