Re: [OS-BUILD PATCHv2 0/17] redhat: Use SPEC variable naming

2022-05-02 Thread Herton R. Krzesinski (via Email Bridge)
From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727#note_932742089 These 3 patches have a small typo in the subject title (Makfile instead of Makefile): ``` 5 21b2bf ! redhat/Makfile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL 6 113694 ! re

Re: [OS-BUILD PATCHv2 0/17] redhat: Use SPEC variable naming

2022-05-02 Thread Herton R. Krzesinski (via Email Bridge)
From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727#note_932738615 This also needs update to use SPECKVERSION and SPECKPATCHLEVEL. Also, please edit rpminspect.yaml to update the template too, I think the ```%%...%%``` template name can be renam

Re: [OS-BUILD PATCHv2 0/17] redhat: Use SPEC variable naming

2022-05-02 Thread Herton R. Krzesinski (via Email Bridge)
From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727#note_932737147 I think you need to update the comment and use the renamed variables here too, SPECKVERSION, SPECKPATCHLEVEL and SPECKSUBLEVEL? ___ ke

[OS-BUILD PATCHv5 0/0] redhat: indicate HEAD state in tarball/rpm name

2022-05-02 Thread Jarod Wilson (via Email Bridge)
From: Jarod Wilson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1735 NOTE: Truncated patchset since committer email 'pra...@redhat.com' does not match the submitter's GitLab public email address 'ja...@redhat.com'. For the non-Fedora (RHEL) cas

Re: [OS-BUILD PATCHv2 0/19] redhat: test updates

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728#note_932324020 Updated due to merge conflict from Herton's CHANGELOG modifications. Rebased on top of !1727. ___ kernel mailing list -- kernel@lists.fedor

[OS-BUILD PATCHv2 19/19] redhat/self-test: Add test to verify Makefile declarations.

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/self-test: Add test to verify Makefile declarations. The Makefiles have been organized such that only Makefile.variables contain external variables that can be set on the command line, and the Makefile only contains variables that can set within the Makefile itself.

[OS-BUILD PATCHv2 16/19] redhat/self-test/data: Cleanup data

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/self-test/data: Cleanup data There have been some additional redhat/Makefile changes that modified variables. Run 'make dist-self-test-data' to clean these changes up. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/re

[OS-BUILD PATCHv2 18/19] redhat/Makefile: Add RHTEST

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Add RHTEST For a long time we have wanted a mechanism by which we could do a 'test run' of Makefile targets. Make has built-in options '-n, --just-print, --dry-run, --recon' that can be added on the command line that allow users to show the output for comm

[OS-BUILD PATCHv2 17/19] redhat: shellcheck cleanup

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat: shellcheck cleanup Some shellcheck cleanups. Signed-off-by: Prarit Bhargava diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -114,7 +114,7 @@ cdate="$(LC_ALL=C date +"%a %b %d %Y

[OS-BUILD PATCHv2 15/19] redhat/self-test: Add test to verify SPEC variables

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/self-test: Add test to verify SPEC variables This test looks at the spec file variable replacement code in redhat/genspec.sh and confirms that each variable begins with "SPEC". Signed-off-by: Prarit Bhargava diff --git a/redhat/docs/makefile-changes.rst b/redhat/d

[OS-BUILD PATCHv2 14/19] redhat/Makefile: Add 'duplicate' SPEC entries for user set variables

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Add 'duplicate' SPEC entries for user set variables INCLUDE_FEDORA_FILES, INCLUDE_RHEL_FILES, and RELEASED_KERNEL are specified in Makefile.variables as they can be set in userspace. Create duplicate entries for these variables that begin with SPEC. This

[OS-BUILD PATCHv2 13/19] redhat/Makefile: Rename TARFILE_RELEASE to SPECTARFILE_RELEASE

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename TARFILE_RELEASE to SPECTARFILE_RELEASE Change TARFILE_RELEASE to SPECTARFILE_RELEASE so that readers understand it is passed into the spec file. Rename TARFILE_RELEASE to SPECTARFILE_RELEASE. Signed-off-by: Prarit Bhargava diff --git a/redhat/Mak

[OS-BUILD PATCHv2 12/19] redhat/genspec: Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/genspec: Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG Change PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG so that readers understand it is passed into the spec file. Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG. Signed-off-by: Prarit Bhargava

[OS-BUILD PATCHv2 11/19] redhat/genspec: Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/genspec: Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED Change DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED so that readers understand it is passed into the spec file. Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED. Signed-off-by: Prarit Bharg

[OS-BUILD PATCHv2 10/19] redhat/Makefile: Rename PKGRELEASE to SPECBUILD

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename PKGRELEASE to SPECBUILD PKGRELEASE is a confusing variable name, and it really is the BUILD string for the specfile. Rename PKGRELEASE to SPECBUILD. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..bla

[OS-BUILD PATCHv2 5/19] redhat/Makfile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makfile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL Change RPMKPATCHLEVEL to SPECPATCHLEVEL so that readers understand it is passed into the spec file. Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Ma

[OS-BUILD PATCHv2 8/19] redhat/Makefile: Rename CHANGELOG to SPECCHANGELOG

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename CHANGELOG to SPECCHANGELOG Change CHANGELOG to SPECCHANGELOG so that readers understand it is passed into the spec file. While the CHANGELOG does have use other than in the spec file it is useful to know that the string is used in the spec file. Re

[OS-BUILD PATCHv2 9/19] redhat/genspec: Rename BUILDID_DEFINE to SPECBUILDID

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/genspec: Rename BUILDID_DEFINE to SPECBUILDID Change BUILDID_DEFINE to SPECBUILDID so that readers understand it is passed into the spec file. Rename BUILDID_DEFINE to SPECBUILDID. Signed-off-by: Prarit Bhargava diff --git a/redhat/genspec.sh b/redhat/genspec.sh

[OS-BUILD PATCHv2 7/19] redhat/Makfile: Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makfile: Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION Change RPMKEXTRAVERSION to SPECEXTRAVERSION so that readers understand it is passed into the spec file. Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefil

[OS-BUILD PATCHv2 0/19] redhat: test updates

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728 Depends: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727 Add a test to verify Makefile declarations, and add the RHTEST variable. The latter of these changes allows u

[OS-BUILD PATCHv2 4/19] redhat/Makefile: Rename RPMKVERSION to SPECKVERSION

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename RPMKVERSION to SPECKVERSION Change RPMKVERSION to SPECVERSION so that readers understand it is passed into the spec file. Rename RPMKVERSION to SPECKVERSION. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index blah

[OS-BUILD PATCHv2 3/19] redhat/Makefile: Rename KVERSION to SPECVERSION

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename KVERSION to SPECVERSION KVERSION is passed into the spec file and is easy to confuse with the kernel KVERSION. Change the name to SPECVERSION so that readers understand it is the %Version field of the specfile. As a result RPMKSUBLEVEL can be dropp

[OS-BUILD PATCHv2 6/19] redhat/Makfile: Rename RPMKSUBLEVEL to SPECKSUBLEVEL

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makfile: Rename RPMKSUBLEVEL to SPECKSUBLEVEL Change RPMKSUBLEVEL to SPECSUBLEVEL so that readers understand it is passed into the spec file. Rename RPMKSUBLEVEL to SPECKSUBLEVEL. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index

[OS-BUILD PATCHv2 2/19] redhat/Makefile: Deprecate some simple targets

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Deprecate some simple targets Deprecate some simple targets. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -420,15 +420,23 @@ $(KABIDW_TARBALL)

[OS-BUILD PATCHv2 1/19] redhat/Makefile: Use KVERSION

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Use KVERSION Use KVERSION where appropriate in the Makefile. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -144,6 +144,9 @@ else MARKER:=v

Re: [OS-BUILD PATCHv2 0/17] redhat: Use SPEC variable naming

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727#note_932320137 MR commits updated due to merge conflict. I had to rework the code for Herton's CHANGELOG modifications, and added a cleanup commit for the tests as well. Successfully tested with "

[OS-BUILD PATCHv2 16/17] redhat/self-test/data: Cleanup data

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/self-test/data: Cleanup data There have been some additional redhat/Makefile changes that modified variables. Run 'make dist-self-test-data' to clean these changes up. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/re

[OS-BUILD PATCHv2 17/17] redhat: shellcheck cleanup

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat: shellcheck cleanup Some shellcheck cleanups. Signed-off-by: Prarit Bhargava diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -114,7 +114,7 @@ cdate="$(LC_ALL=C date +"%a %b %d %Y

[OS-BUILD PATCHv2 14/17] redhat/Makefile: Add 'duplicate' SPEC entries for user set variables

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Add 'duplicate' SPEC entries for user set variables INCLUDE_FEDORA_FILES, INCLUDE_RHEL_FILES, and RELEASED_KERNEL are specified in Makefile.variables as they can be set in userspace. Create duplicate entries for these variables that begin with SPEC. This

[OS-BUILD PATCHv2 15/17] redhat/self-test: Add test to verify SPEC variables

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/self-test: Add test to verify SPEC variables This test looks at the spec file variable replacement code in redhat/genspec.sh and confirms that each variable begins with "SPEC". Signed-off-by: Prarit Bhargava diff --git a/redhat/docs/makefile-changes.rst b/redhat/d

[OS-BUILD PATCHv2 13/17] redhat/Makefile: Rename TARFILE_RELEASE to SPECTARFILE_RELEASE

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename TARFILE_RELEASE to SPECTARFILE_RELEASE Change TARFILE_RELEASE to SPECTARFILE_RELEASE so that readers understand it is passed into the spec file. Rename TARFILE_RELEASE to SPECTARFILE_RELEASE. Signed-off-by: Prarit Bhargava diff --git a/redhat/Mak

[OS-BUILD PATCHv2 11/17] redhat/genspec: Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/genspec: Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED Change DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED so that readers understand it is passed into the spec file. Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED. Signed-off-by: Prarit Bharg

[OS-BUILD PATCHv2 12/17] redhat/genspec: Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/genspec: Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG Change PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG so that readers understand it is passed into the spec file. Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG. Signed-off-by: Prarit Bhargava

[OS-BUILD PATCHv2 8/17] redhat/Makefile: Rename CHANGELOG to SPECCHANGELOG

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename CHANGELOG to SPECCHANGELOG Change CHANGELOG to SPECCHANGELOG so that readers understand it is passed into the spec file. While the CHANGELOG does have use other than in the spec file it is useful to know that the string is used in the spec file. Re

[OS-BUILD PATCHv2 10/17] redhat/Makefile: Rename PKGRELEASE to SPECBUILD

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename PKGRELEASE to SPECBUILD PKGRELEASE is a confusing variable name, and it really is the BUILD string for the specfile. Rename PKGRELEASE to SPECBUILD. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..bla

[OS-BUILD PATCHv2 9/17] redhat/genspec: Rename BUILDID_DEFINE to SPECBUILDID

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/genspec: Rename BUILDID_DEFINE to SPECBUILDID Change BUILDID_DEFINE to SPECBUILDID so that readers understand it is passed into the spec file. Rename BUILDID_DEFINE to SPECBUILDID. Signed-off-by: Prarit Bhargava diff --git a/redhat/genspec.sh b/redhat/genspec.sh

[OS-BUILD PATCHv2 7/17] redhat/Makfile: Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makfile: Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION Change RPMKEXTRAVERSION to SPECEXTRAVERSION so that readers understand it is passed into the spec file. Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefil

[OS-BUILD PATCHv2 5/17] redhat/Makfile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makfile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL Change RPMKPATCHLEVEL to SPECPATCHLEVEL so that readers understand it is passed into the spec file. Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Ma

[OS-BUILD PATCHv2 4/17] redhat/Makefile: Rename RPMKVERSION to SPECKVERSION

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename RPMKVERSION to SPECKVERSION Change RPMKVERSION to SPECVERSION so that readers understand it is passed into the spec file. Rename RPMKVERSION to SPECKVERSION. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index blah

[OS-BUILD PATCHv2 6/17] redhat/Makfile: Rename RPMKSUBLEVEL to SPECKSUBLEVEL

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makfile: Rename RPMKSUBLEVEL to SPECKSUBLEVEL Change RPMKSUBLEVEL to SPECSUBLEVEL so that readers understand it is passed into the spec file. Rename RPMKSUBLEVEL to SPECKSUBLEVEL. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index

[OS-BUILD PATCHv2 3/17] redhat/Makefile: Rename KVERSION to SPECVERSION

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Rename KVERSION to SPECVERSION KVERSION is passed into the spec file and is easy to confuse with the kernel KVERSION. Change the name to SPECVERSION so that readers understand it is the %Version field of the specfile. As a result RPMKSUBLEVEL can be dropp

[OS-BUILD PATCHv2 0/17] redhat: Use SPEC variable naming

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727 Depends: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1647 One of the common complaints about the redhat Makefiles, genspec.sh, and kernel.spec.template is that it is n

[OS-BUILD PATCHv2 1/17] redhat/Makefile: Use KVERSION

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Use KVERSION Use KVERSION where appropriate in the Makefile. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -144,6 +144,9 @@ else MARKER:=v

[OS-BUILD PATCHv2 2/17] redhat/Makefile: Deprecate some simple targets

2022-05-02 Thread Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava redhat/Makefile: Deprecate some simple targets Deprecate some simple targets. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -420,15 +420,23 @@ $(KABIDW_TARBALL)