Add documentation on how to build a hotfix #505
Conversation
| build a hotfix against, for example `manageiq-release-18.0-1.el9.src.rpm` | ||
|
|
||
| ```sh | ||
| docker run --rm -v `pwd`/OPTIONS:/root/OPTIONS -v `pwd`/BUILD:/root/BUILD $USER/rpm_build:radjabov-hotfix build_hotfix |
There was a problem hiding this comment.
NOTE instead of a separate volume map for the hotfix dir it seemed easier to just map ./BUILD so the artifacts and the srpm are in one place but if this doesn't work for some reason I can change it
There was a problem hiding this comment.
I thought we already had this documented, but maybe not. @bdunne Please review.
There was a problem hiding this comment.
Yeah I didn't see any so this started as me just taking notes on what I had to do so we had something to reference in the future
There was a problem hiding this comment.
Having the docker command here is helpful
So much time goes between needing to build rpms that I often forget.
Re: "I thought we already had this documented"
On the mac, mapping the BUILD volume was horribly slow. Think I mapped BUILD/rpm to speed it up.
I remember putting together documentation on this a while back but people seemed to disagree on the best approach.
There was a problem hiding this comment.
On the mac, mapping the BUILD volume was horribly slow. Think I mapped BUILD/rpm to speed it up.
I remember putting together documentation on this a while back but people seemed to disagree on the best approach.
Oh did you have hotfix documentation? Or you mean documentation on how to build rpms on a mac?
There was a problem hiding this comment.
My only addition is that I needed to manually clean the hotfix directory of everything but the srpm. It was listing the patch file multiple times in the rpm spec. I'll open a PR. We should just clean it before we copy over things.
EDIT: Shockingly, I didn't get it to patch the files the first time, so I was getting:
error: patch 1 defined multiple times
I cleaned up the directory manually but then decided to fix the code so I'll open a PR with my changes. We can discuss it there.
EDIT 2:
Opened a PR to clean the hotfix directory to resolve this problem: #537
There was a problem hiding this comment.
sorry, one last thing...
Note, I couldn't actually build a hotfix patch manageiq srpm.
Everything else seems to be working, although the manageiq release value of 1 in the spec doesn't line up with the expectation of a date format seen here. I had to use the product srpm to actually test building a hotfix.
agrare
changed the title
|
|
||
| Which will create a patch file: `0001-Merge-pull-request-23123-from-agrare-fix_miq_request.patch` | ||
|
|
||
| Next we have to change the file location to match the RPM BUILDDIR, for a patch in the core rpm this will be e.g. `manageiq-core-18.0-1` |
There was a problem hiding this comment.
I'm not totally sure what you did here.
Can you show us a diff of the fix_miq_request.patch?
Was it just a change to first line?
Yes, meta, a diff of a diff, but just trying to understand what was done here.
or maybe show it as a sed command?
There was a problem hiding this comment.
We also need to mention that you should remove any spec files from the patches.
There was a problem hiding this comment.
@agrare Can you add the note about removing specs from the patch file?
|
This pull request has been automatically marked as stale because it has not been updated for at least 3 months. If these changes are still valid, please remove the |
agrare
force-pushed
the
add_hotfix_documentation
branch
from
f665fcd to
0c18222
Compare
|
@bdunne Please review. |
agrare
force-pushed
the
add_hotfix_documentation
branch
from
0c18222 to
466224a
Compare
| This ensures that the hotfix patch will apply correctly when it is run. Then move that patch | ||
| file to `rpm_spec/patches/` in the rpm_build repo. | ||
|
|
||
| `docker build --pull --tag $USER/rpm_build:radjabov-hotfix .` |
There was a problem hiding this comment.
FYI, I needed to supply the arch when building on my mac since we don't have aarch64 rpms in our manageiq rpm repository and my platform isn't the most common target arch: x86_64:
podman build --pull --arch=x86_64 --tag $USER/rpm_build:radjabov-hotfix .
There was a problem hiding this comment.
That's probably an issue for all of the docker examples in this README. Maybe we split out a PR to update all of them to work on a mac?
There was a problem hiding this comment.
oh for sure... I'm trying to validate it since I'm in this neck of the woods anyway.
There was a problem hiding this comment.
Is podman the way to go on mac silicon macs now? Maybe we can drop the docker commands here now too
There was a problem hiding this comment.
Not sure. That's what I'm using. 😉
There was a problem hiding this comment.
FYI, the next command also worked with podman:
podman run --rm -v `pwd`/OPTIONS:/root/OPTIONS -v `pwd`/BUILD:/root/BUILD $USER/rpm_build:radjabov-hotfix build_hotfix
There was a problem hiding this comment.
Yeah would be awesome if we could get one set of instructions that work for all, don't want to end up with another developer_setup with mac+ubuntu+centos yum+centos dnf for everything
There was a problem hiding this comment.
I'm using podman desktop, but docker is still "common"
TODO: