#47611 Add script to build patched RPMs
Closed: Fixed None Opened 6 years ago by nkinder.

We currently have the ability to build RPMs from HEAD on a git branch my using the targets in rpm.mk. There are some scanning tools (such as Coverity) that are smart enough to be able to do differential scans when building a RPM that has patches. This scans the source tarball, then does a second scan including the patches defined in the specfile, then reports the diff of the results. We should add the ability to easily build a patched RPM that be used with scanning tools like this.


I don't think we want to do this in the 1.3.1 branch:
{{{
- # VERSION_PREREL=.pre.a1
+ VERSION_PREREL=.a1
}}}

Part 1 for 1.3.1 (add make rpms, allow make rpms without congfiure, and Add git commit hash to developer rpm build name)
0001-Ticket-47611-Add-make-rpms-build-targe.patch

Replying to [comment:5 rmeggins]:

I don't think we want to do this in the 1.3.1 branch:
{{{
- # VERSION_PREREL=.pre.a1
+ VERSION_PREREL=.a1
}}}

I commented it out. New patch is attached (prior to running autogen.sh)...

Part 1:

git merge ticket47611
Updating 08dc37d..6a49bf3
Fast-forward
Makefile.am | 2 +
VERSION.sh | 10 +-
rpm.mk | 51 ++
rpm/389-ds-base-devel.README | 4 +
rpm/389-ds-base-git.sh | 16 +
rpm/389-ds-base.spec.in | 1485 ++++++++++++++++++++++++++++++++++++++++++
rpm/rpmverrel.sh | 15 +
7 files changed, 1582 insertions(+), 1 deletions(-)
create mode 100644 rpm.mk
create mode 100644 rpm/389-ds-base-devel.README
create mode 100644 rpm/389-ds-base-git.sh
create mode 100644 rpm/389-ds-base.spec.in
create mode 100755 rpm/rpmverrel.sh

git push origin 389-ds-base-1.3.1
Counting objects: 13, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 24.01 KiB, done.
Total 10 (delta 3), reused 4 (delta 0)
To ssh://git.fedorahosted.org/git/389/ds.git
08dc37d..6a49bf3 389-ds-base-1.3.1 -> 389-ds-base-1.3.1

commit 6a49bf3
Author: Mark Reynolds mreynolds@redhat.com
Date: Tue Dec 10 16:53:18 2013 -0500

Part 2

git merge ticket47611
Updating 6a49bf3..2a92a6c
Fast-forward
rpm.mk | 16 +++++++++++++++
rpm/add_patches.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 0 deletions(-)
create mode 100755 rpm/add_patches.sh

git push origin 389-ds-base-1.3.1
Counting objects: 8, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.34 KiB, done.
Total 5 (delta 3), reused 0 (delta 0)
To ssh://git.fedorahosted.org/git/389/ds.git
6a49bf3..2a92a6c 389-ds-base-1.3.1 -> 389-ds-base-1.3.1

commit 2a92a6c
Author: Mark Reynolds mreynolds@redhat.com
Date: Tue Dec 10 17:30:23 2013 -0500

Metadata Update from @mreynolds:
- Issue assigned to mreynolds
- Issue set to the milestone: 1.3.1.17

3 years ago

Login to comment on this ticket.

Metadata