#48277 Assorted build fixes and make rpms target
Closed: Fixed None Opened 4 years ago by simo.

I wanted to try a simple patch but the build tree was not in a state that would easily allow me to buld rpm for testing on my test rig.

I started looking into quickly adding a make rpms target and run in several issues with the Makefile.

The attached patchset implements the following:
1. fixes make dist
2. version is now sane and uses a date as well as git commit id for non-release build
3. adds make rpms
4. gitignore properly exclude generated files
5. autogenrated files that causes the tree to alays be dirty by just running a build are removed from the git tree and ignored

HTH,
Simo.


Hi Simo, I reviewed patches 0001 through 0004. They look good.

But regarding the auto-generated file removal, we discussed in the team and could not approve it. We have been building our binaries in the way for ages. And the style is shared with the community.

Could it be possible to approve your patch 0001 through 0004 but 0005?

Thanks,
--noriko

By all means go aheadf with 1-4 only, I knew 5 was controversial.
Would yhou accept a patch to just add the file touched by 0005 in .gitignore ?
It would mean you have to remember to add them explicitly whenever you want to commit them, but they won't bother all other developers that do not care about them.

Replying to [comment:2 simo]:

By all means go aheadf with 1-4 only, I knew 5 was controversial.
Would yhou accept a patch to just add the file touched by 0005 in .gitignore ?
It would mean you have to remember to add them explicitly whenever you want to commit them, but they won't bother all other developers that do not care about them.

Sure. Sounds good to me. Thanks for your understanding!

git patch file (master) -- extracted .gitignore part from 0005-Remove-autogenerated-files-from-git.patch
0001-Updating-.gitignore.patch

git patch file (master) -- autogenerated files {Makefile.in,aclocal.m4,configure}
0002-Ticket-48277-Assorted-build-fixes-and-make-rpms-targ.patch

The current proposal:
{{{
0001-Fix-Makefile-so-that-make-dist-works.patch​ (8.3 KB)
0002-Change-prereleases-to-use-date-git-commit-format.patch​ (2.7 KB)
0003-Add-make-rpms-target.patch​ (4.1 KB)
0004-Ignore-build-artifacts.patch​ (5.4 KB)
0001-Updating-.gitignore.patch​ (628 bytes)
git patch file (master) -- extracted .gitignore part from 0005-Remove-autogenerated-files-from-git.patch
0002-Ticket-48277-Assorted-build-fixes-and-make-rpms-targ.patch​ (24.4 KB)
git patch file (master) -- autogenerated files {Makefile.in,aclocal.m4,configure}
}}}

Reviewed by Rich and Noriko.

Pushed to master on behalf of Simo. Thanks to Simo for his contribution!!
{{{
fba0194..c7fe975 master -> master
commit 5d98edd
commit 24db783
commit 44cc536
commit 1da8437
commit f2f6532
commit c7fe975
}}}

Apparently to run make rpms straight from git without requiring to run autoreconf -fi more files in m4/ needs to be added to the git tree.Patch will follow.

ack

Pushed to master:
c7fe975..a35ef55 master -> master
commit a35ef55

STEPS:
$ cd ds
$ git clean -f -x -d
$ ./configure --with-openldap
$ make dist
$ ls 389-ds-base-*.tar.bz2
389-ds-base-1.3.5.tar.bz2

Metadata Update from @simo:
- Issue set to the milestone: 1.3.5 backlog

2 years ago

Login to comment on this ticket.

Metadata