Add notion of major/minor version to RHEL profiles

* profiles/rh-release (spec_file.rpm_dist): Define to "el{major}_{minor}". * profiles/rh-testing (spec_file.rpm_dist): Likewise. * templates/config: Add configuration options for major/minor. * bin/ddiskit (parse_cli): Add options for setting major/minor in prepare_sources command. * ddiskit.1 (.SS Options for prepare_sources action): Document -M and -m options. References: #2 References: #8 Signed-off-by: Eugene Syromiatnikov <[email protected]>
orosp · Jan 15, 2019 · c6affc3 · c6affc3
1 parent 33e69c6
commit c6affc3
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/bin/ddiskit b/bin/ddiskit
@@ -2045,6 +2045,10 @@ def parse_cli():
                                              "directories in the git " +
                                              "repository that contains " +
                                              "module source files")
+    parser_prepare_sources.add_argument("-M", "--major",
+                                        help="Major distribution version")
+    parser_prepare_sources.add_argument("-m", "--minor",
+                                        help="Minor distribution version")
     parser_prepare_sources.set_defaults(func=cmd_prepare_sources)
 
     # parser for the "generate_spec" command

diff --git a/ddiskit.1 b/ddiskit.1
@@ -225,6 +225,24 @@ Configuration option name:
 .I defaults.git_src_directory
 .br
 Default value: none
+.TP
+\fB-M\fR \fIMAJOR\fR, \fB--major\fR \fIMAJOR\fR
+Major version number of the distribution the package is built for
+(for example, "\fB7\fR" for RHEL 7.3).
+.IP
+Configuration option name:
+.I defaults.major
+.br
+Default value: 7
+.TP
+\fB-m\fR \fIMINOR\fR, \fB--minor\fR \fIMINOR\fR
+Minor version number of the distribution the package is built for
+(for example, "\fB3\fR" for RHEL 7.3).
+.IP
+Configuration option name:
+.I defaults.minor
+.br
+Default value: 0
 .\"
 .SS Options for generate_spec action
 .TP

diff --git a/ddiskit.config b/ddiskit.config
@@ -1,6 +1,9 @@
 [defaults]
 profile = default
 
+major = 7
+minor = 0
+
 [rpm_gpg_check]
 ## Some initial assumption about the keyring dir
 keyring_dir = {defaults.res_dir}/keyrings/{defaults.profile}

diff --git a/profiles/rh-release b/profiles/rh-release
@@ -6,6 +6,9 @@
 ## to allow check to work.
 check_git_src = 2
 
+[spec_file]
+rpm_dist = el{defaults.major}_{defaults.minor}
+
 [rpm_gpg_check]
 ## It should be a strict check for release ISOs
 check_level = 3

diff --git a/profiles/rh-testing b/profiles/rh-testing
@@ -7,6 +7,7 @@
 check_git_src = 2
 
 [spec_file]
+rpm_dist = el{defaults.major}_{defaults.minor}
 description_suffix =
 	This RPM has been provided by Red Hat for testing purposes only and is
 	NOT supported for any other use. This RPM should NOT be deployed for

diff --git a/templates/config b/templates/config
@@ -11,6 +11,13 @@
 ## Include SRPM files into the final ISO
 include_srpm = %{global.include_srpm}
 
+##
+## Behavioural settings and generic/common definitions
+##
+[defaults]
+major = %{defaults.major}
+minor = %{defaults.minor}
+
 ##
 ## configuration values for the driver spec file
 ##