OpenAFS Master Repository branch, master, updated. BP-openafs-stable-1_8_x-670-g8b68f1a
Gerrit Code Review
Fri, 4 Sep 2020 10:16:00 -0400
The following commit has been merged in the master branch:
Author: Michael Meffie <email@example.com>
Date: Fri May 1 14:05:24 2020 -0400
makesrpm: Support custom version strings
The makesrpm.pl script generates a source RPM by creating a temporary
rpmbuild workspace, populating the SOURCES and SPECS directories in that
workspace, running rpmbuild to build the source RPM, and finally copying
the resulting source RPM out of the temporary workspace.
The name of the source RPM file created by rpmbuild depends on the
package version and release strings. Unfortunately, the format of the
source RPM file name changed around OpenAFS 1.6.0, so makesrpm.pl has
special logic to find the version string and extra code depending on the
detected OpenAFS version.
Instead of trying to predict the name of the resulting source RPM file
from the OpenAFS version string, and having different logic for old
versions of OpenAFS, use a filename glob to find resulting source RPM
file name in the temporary rpmbuild workspace.
Remove the major, minor, and patch level variables, which were only used
to guess the name of the resulting source RPM file name.
Convert '-' characters to '_' in the package version and package
release, since the '-' character is reserved by rpm as a field
While here, add the --dir option to specify the path of the generated
source RPM, and change the 'srpm' makefile target to use the new --dir
option, instead of changing the current directory before running
makesrpm.pl. Also, add a dependency on the 'dist' makefile target,
since the the source and document tarballs are required to build the
Add pod documentation and add the --help (-h) option to print a brief
help message, and add the --man option to print the full man page.
With this change, we can build a source RPM even when the .version file
in the src.tar.bz file has a custom format or was created from a
checkout of the master branch or other non-release reference.
Tested-by: BuildBot <firstname.lastname@example.org>
Reviewed-by: Andrew Deason <email@example.com>
Reviewed-by: Cheyenne Wills <firstname.lastname@example.org>
Reviewed-by: Benjamin Kaduk <email@example.com>
Makefile.in | 6 ++-
src/packaging/RedHat/makesrpm.pl | 87 ++++++++++++++++++++++++++++----------
2 files changed, 69 insertions(+), 24 deletions(-)
OpenAFS Master Repository