date:20220512

Re: [OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

2022-05-12 Thread Thorsten Leemhuis (via Email Bridge)

From: Thorsten Leemhuis on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757#note_945430959

Many thx for your reply.

> Filing issues would be helpful. If you can, please @ notify me in those
issues.

You sure about this? From the other stuff you wrote it seems you already have
a battle plan for cleaning up kernel.spec and I don't think I provided any
bright new insights for that. So maybe I'll just let you continue doing your
work -- and once you get down to it I'll take time for a closer look at the
changes to provide and feedback and an extra set of eyes then.

>> * is there a specific reason why kernel-ark is using the first 15
characters of the commit-id for snapshot naming instead of just 12 characters,
as typically used by kernel developers upstream? I ask as I ran into failures
like `5.18.0-0.rc0.20220401gite8b767f5e04097a.15.vanilla.1.fc36.aarch64
exceeds 64 characters` with my vanilla builds. Seems the `20220401git` part is
gone after these patches which would solve this for me, but I'd say being more
in line with what upstream typically does would be nice.

> @dzickusrh requested future proofing of this field. I have no issue with
changing this back to the current linux standard 12-characters, however, there
is some merit into his thoughts for the future.

I can understand that line of thought, but I think being closer in line with
what upstream does would be nice and leaves a bit more space for people that
use local tags. And I guess Linux upstream sooner or later will talk about
switching to sha256sums anyway, which might be a point where they will switch
to a longer shorted value anyway which kernel-ark could pick up then.

But I don't care too much if there are say at least say 10 to 15 characters
left for people to apply a local tag to their packages (like my '.vanilla').
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

Re: [OS-BUILD PATCH] redhat/docs: Add a description of kernel naming

2022-05-12 Thread Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1779#note_945247919

I think you mean SPECKSUBLEVEL at the beginning here.
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCH] redhat/docs: Add a description of kernel naming

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/docs: Add a description of kernel naming

Add a file that describes how kernel NVRs are constructed.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/docs/index.rst b/redhat/docs/index.rst
index blahblah..blahblah 100644
--- a/redhat/docs/index.rst
+++ b/redhat/docs/index.rst
@@ -111,6 +111,7 @@ Contributor Guide
submitting-contributions
faq
makefile-changes
+   kernel-naming
 
 
 Maintainer Guide
diff --git a/redhat/docs/kernel-naming.rst b/redhat/docs/kernel-naming.rst
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/docs/kernel-naming.rst
@@ -0,0 +1,44 @@
+.. _kernel-naming:
+
+=
+Kernel Naming
+=
+
+The kernel NVR looks like, for example,
+kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35.  This string contains
+information about the upstream release, a unique build number, and information
+about the distribution the RPM was targeted for.  An explanation of each of the
+fields and how the fields are used in the kernel NVR, is below.
+
+**PACKAGE_NAME**: This is the name of the package.  By default this is
+'kernel', but a well-known variant is kernel-rt.
+
+**SPECKVERSION**: This is the VERSION variable defined in the top-level linux
+Makefile.
+
+**SPECKPATCHLEVEL**: This is the PATCHLEVEL variable defined in the top-level
+linux Makefile.
+
+**SUBLEVEL**: This is the SUBLEVEL variable defined in the top-level linux
+Makefile.
+
+**UPSTREAMBUILD**: This is a representation of the upstream build information.
+It includes the EXTRAVERSION variable (defined in the top-level Makefile) or
+'rc0' if the tree is based on an a specific upstream release.  If the tree is
+not based on a specific "rc" release, this field also contains a git hash
+reference to the top of tree commit.
+
+**BUILD**: This is the RHEL_RELEASE variable defined in the top-level linux
+Makefile.rhelver.
+
+**LOCALVERSION**: By default, this variable is set to ".test".  This value can
+be overriden by defining a string in redhat/localversion.
+
+**DIST**:  This is the dist release suffix used in the package release, eg.
+.fc34 or .el9.
+
+The kernel name is constructed as
+
+$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(UPSTREAMBUILD)$(BUILD)$(LOCALVERSION)$(DIST)
+
+In general, the kernel follows the Fedora Naming Guidelines, 
`https://fedoraproject.org/wiki/Packaging:Naming?rd=Packaging:NamingGuidelines

[OS-BUILD PATCH] redhat/configs: Fix rm warning on error

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/configs: Fix rm warning on error

When an unset config is found, process_configs.sh cleans up and returns an
error.  In this case the .newconfigs file is not created and errors
like

rm: cannot remove '.newoptions18': No such file or directory
rm: cannot remove '.newoptions16': No such file or directory
rm: cannot remove '.newoptions17': No such file or directory

are output to the user.

Since we output the "real" error at the end of the output, these errors
can be safely ignored.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/configs/process_configs.sh 
b/redhat/configs/process_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/process_configs.sh
+++ b/redhat/configs/process_configs.sh
@@ -262,7 +262,7 @@ function process_config()
rm .newoptions"${count}"
RETURNCODE=1
fi
-   rm .newoptions"${count}"
+   rm -f .newoptions"${count}"
 
grep -E 'config.*warning' .listnewconfig"${count}" > .warnings"${count}"
if test -n "$CHECKWARNINGS" && test -s .warnings"${count}"

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1778
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

Re: [OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757#note_945045363

>I quickly took a look at the state of things after this patchset and noticed
a few odd things I thought I mention; some or all of them are from before this
patchset, but with all the changes you are doing maybe you are interested in
these comments. I can file separate issues for any items raised here if you
are interested, too.

Filing issues would be helpful.  If you can, please @ notify me in those
issues.

>
>* is there a specific reason why kernel-ark is using the first 15 characters
of the commit-id for snapshot naming instead of just 12 characters, as
typically used by kernel developers upstream? I ask as I ran into failures
like `5.18.0-0.rc0.20220401gite8b767f5e04097a.15.vanilla.1.fc36.aarch64
exceeds 64 characters` with my vanilla builds. Seems the `20220401git` part is
gone after these patches which would solve this for me, but I'd say being more
in line with what upstream typically does would be nice.

@dzickusrh requested future proofing of this field.  I have no issue with
changing this back to the current linux standard 12-characters, however,
there is some merit into his thoughts for the future.

@dzickusrh, counter thoughts?  I'm completely open to both viewpoints.

>
>I also looked at the generated kernel.spec for fedora and noticed a few
things that sill look odd, so I'll quickly mention them as well:
>
>* Is a `%define kversion 5` worth it if `kversion` is later just used once?

To answer your question: Nope.  It isn't worth having the kversion define.

The explanation here is that my effort has been to first target the
redhat/Makefile and to clean it up and the scripts the Makefile calls.

I will be looking into cleaning up the spec file but a first step here
needed to be to better understand how internal variables (defined in
redhat/Makefile) and variables available to users (defined in
redhat/Makefile.variables) are consumed in the spec file.

FWIW: When I asked a similar question a few months ago, no one could give me
an answer.  What I've tried to do is to at least reorganize the Makefiles
so that we can understand that part of process of creating an SRPM in the
kernel-ark repo.

And :) from you questions which are about the kernel spec file and NOT THE
MAKEFILE :) :) it seems like I've done at least a halfway decent job. :)

>
>* This whole section looks odd too me:
>```
>%define specversion 5.18.0
>%define patchversion 5.18
>%define pkgrelease 0.rc6.47.test
>%define kversion 5
>%define tarfile_release 5.18-rc6
># This is needed to do merge window version magic
>%define patchlevel 18
># allow pkg_release to have configurable %%{?dist} tag
>%define specrelease 0.rc6.47%{?buildid}%{?dist}
>
>#
># End of genspec.sh variables
>#
>
>%define pkg_release %{specrelease}
>```
>
>Having both `pkgrelease` and `pkg_release` with slightly different contents
for example is confusing. And why are we defining `specrelease` just to assign
it to `pkg_release` a little later? And there is so much redundancy here, if
someone wants to change the spec file directly downstream (say from a SRPM)
this gets hard.

Completely agreed.  It's something I noticed and plan on targeting in a
future change.  I very much dislike those similar variable names.

>
>To illustrate what I mean: shouldn't the section above maybe look more like
this (untested! just for illustration!)?
>
>```
>%define kversion 5
>%define patchlevel 18
>%define patchversion %{kversion}.%{patchlevel}
>%define specversion %{patchversion}.0
>%define pkgrelease 0.rc6.47.test
>%define tarfile_release %{patchversion}-rc6
>#
># End of genspec.sh variables
>#

>
>%define pkg_release 0.rc6.47%{?buildid}%{?dist}
>```

Great idea :)  I've been thinking about how to reorganize and clean this
all up, but I wanted the Makefile cleanup completed first.

>
>Still not nice and definitely won't cover quite a few use cases, but as I
said: I just wanted to illustrate how things could look a bit easier to
understand in the resulting spec file.

I understand and feel the frustration in this comment <- not meant to be a
joke.  I mean that very seriously.  I have found myself very frustrated by
the redhat/Makefile and spec file when making *minor* changes, or trying
to understand the overall NVR naming convention used in the spec file.  I
hope I've at least started us on a path to making all of this better for
everyone to understand and contribute future changes to.
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it:

✅ PASS: Test report for kernel 5.17.7-200.fc35 (fedora-35)

2022-05-12 Thread CKI Project

Hello,

We ran automated tests on the following kernel build:

Kernel package: kernel-5.17.7-200.fc35
 Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=86949496

The results of these automated tests are provided below.

Overall result: PASSED
 Tests: OK



All kernel binaries, config files, and logs are available for download here:

  
https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?prefix=datawarehouse-public/2022/05/12/537826395

Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
For the full detail on our testing procedures, please scroll to the bottom of
this message.

,-.   ,-.
   ( C ) ( K )  Continuous
`-',-.`-'   Kernel
  ( I ) Integration
   `-'
__

Hardware testing

We booted each kernel and ran the following tests:

  aarch64:
Host 1:

   ⚡ Internal infrastructure issues prevented one or more tests (marked
   with ⚡⚡⚡) from running on this architecture.
   This is not the fault of the kernel that was tested.

    ⚡⚡⚡ SELinux Custom Module Setup
    ⚡⚡⚡ machineinfo
   ⚡⚡⚡ Boot test
   ⚡⚡⚡ IPMI driver test
   ⚡⚡⚡ IPMItool loop stress test
   ⚡⚡⚡ stress: stress-ng - interrupt
   ⚡⚡⚡ stress: stress-ng - cpu
   ⚡⚡⚡ stress: stress-ng - cpu-cache
   ⚡⚡⚡ stress: stress-ng - memory
    ⚡⚡⚡ Storage blktests - blk
    ⚡⚡⚡ Storage blktests - nvme-tcp
    ⚡⚡⚡ Storage block - filesystem fio test
    ⚡⚡⚡ Storage block - queue scheduler test
    ⚡⚡⚡ Storage block - storage fio numa
   ⚡⚡⚡ Reboot test

Host 2:

   ⚡ Internal infrastructure issues prevented one or more tests (marked
   with ⚡⚡⚡) from running on this architecture.
   This is not the fault of the kernel that was tested.

    ⚡⚡⚡ SELinux Custom Module Setup
    ⚡⚡⚡ machineinfo
   ⚡⚡⚡ Boot test
   ⚡⚡⚡ ACPI table test
   ⚡⚡⚡ ACPI enabled test
   ⚡⚡⚡ LTP - cve
   ⚡⚡⚡ LTP - sched
   ⚡⚡⚡ LTP - syscalls
   ⚡⚡⚡ LTP - can
   ⚡⚡⚡ LTP - commands
   ⚡⚡⚡ LTP - containers
   ⚡⚡⚡ LTP - dio
   ⚡⚡⚡ LTP - fs
   ⚡⚡⚡ LTP - fsx
   ⚡⚡⚡ LTP - math
   ⚡⚡⚡ LTP - hugetlb
   ⚡⚡⚡ LTP - mm
   ⚡⚡⚡ LTP - nptl
   ⚡⚡⚡ LTP - pty
   ⚡⚡⚡ LTP - ipc
   ⚡⚡⚡ LTP - tracing
   ⚡⚡⚡ LTP: openposix test suite
   ⚡⚡⚡ CIFS Connectathon
   ⚡⚡⚡ POSIX pjd-fstest suites
   ⚡⚡⚡ Loopdev Sanity
   ⚡⚡⚡ jvm - jcstress tests
   ⚡⚡⚡ Memory: fork_mem
   ⚡⚡⚡ Memory function: memfd_create
   ⚡⚡⚡ AMTU (Abstract Machine Test Utility)
   ⚡⚡⚡ Networking bridge: sanity
   ⚡⚡⚡ Ethernet drivers sanity
   ⚡⚡⚡ Networking MACsec: sanity
   ⚡⚡⚡ Networking socket: fuzz
   ⚡⚡⚡ Networking sctp-auth: sockopts test
   ⚡⚡⚡ Networking: igmp conformance test
   ⚡⚡⚡ Networking route: pmtu
   ⚡⚡⚡ Networking route_func - local
   ⚡⚡⚡ Networking route_func - forward
   ⚡⚡⚡ Networking TCP: keepalive test
   ⚡⚡⚡ Networking UDP: socket
   ⚡⚡⚡ Networking cki netfilter test
   ⚡⚡⚡ Networking tunnel: geneve basic test
   ⚡⚡⚡ Networking tunnel: gre basic
   ⚡⚡⚡ L2TP basic test
   ⚡⚡⚡ Networking tunnel: vxlan basic
   ⚡⚡⚡ Networking ipsec: basic netns - transport
   ⚡⚡⚡ Networking ipsec: basic netns - tunnel
   ⚡⚡⚡ Networking vnic: ipvlan/basic
   ⚡⚡⚡ Libkcapi AF_ALG test
   ⚡⚡⚡ pciutils: update pci ids test
   ⚡⚡⚡ ALSA PCM loopback test
   ⚡⚡⚡ ALSA Control (mixer) Userspace Element test
   ⚡⚡⚡ storage: dm/common
   ⚡⚡⚡ lvm thinp sanity
   ⚡⚡⚡ lvm snapper test
   ⚡⚡⚡ storage: SCSI VPD
   ⚡⚡⚡ Storage: swraid mdadm raid_module test
   ⚡⚡⚡ Storage: swraid scsi_raid
   ⚡⚡⚡ trace: ftrace/tracer
    ⚡⚡⚡ Podman system test - as root
    ⚡⚡⚡ Podman system test - as user
    ⚡⚡⚡ i2c: i2cdetect sanity
    ⚡⚡⚡ NFS Connectathon
    ⚡⚡⚡ Firmware test suite
    ⚡⚡⚡ Memory function: kaslr
    ⚡⚡⚡ Networking tunnel: permtest
    ⚡⚡⚡ Networking VRF: sanity
    ⚡⚡⚡ audit: audit testsuite test
    ⚡⚡⚡ Usex - version 1.9-29
    ⚡⚡⚡ Storage: block zstd compression test
    ⚡⚡⚡ Storage: block zstd smoke test
    ⚡⚡⚡ lvm thinp stqe test
    ⚡⚡⚡ lvm cache test
    ⚡⚡⚡ storage: software RAID testing
    ⚡⚡⚡ storage: targetcli basic
   ⚡⚡⚡ Reboot test

Host 3:

   ⚡ Internal infrastructure issues prevented one or more tests (marked
   with ⚡⚡⚡) from running on this architecture.
   This is not the fault of the kernel that was tested.

    ⚡⚡⚡ SELinux Custom Module Setup
    ⚡⚡⚡ machineinfo
   ⚡⚡⚡ Boot test
   ⚡⚡⚡ xfstests - ext4
   ⚡⚡⚡ xfstests - xfs
    ⚡⚡⚡ xfstests - btrfs
   ⚡⚡⚡ Reboot test

Host 4:

Re: [OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

2022-05-12 Thread Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757#note_945020734

Thank you Prarit. Looks good to me now.
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

Re: [OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

2022-05-12 Thread Thorsten Leemhuis (via Email Bridge)

From: Thorsten Leemhuis on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757#note_944982234

I quickly took a look at the state of things after this patchset and noticed a
few odd things I thought I mention; some or all of them are from before this
patchset, but with all the changes you are doing maybe you are interested in
these comments. I can file separate issues for any items raised here if you
are interested, too.

* is there a specific reason why kernel-ark is using the first 15 characters
of the commit-id for snapshot naming instead of just 12 characters, as
typically used by kernel developers upstream? I ask as I ran into failures
like `5.18.0-0.rc0.20220401gite8b767f5e04097a.15.vanilla.1.fc36.aarch64
exceeds 64 characters` with my vanilla builds. Seems the `20220401git` part is
gone after these patches which would solve this for me, but I'd say being more
in line with what upstream typically does would be nice.

I also looked at the generated kernel.spec for fedora and noticed a few things
that sill look odd, so I'll quickly mention them as well:

* Is a `%define kversion 5` worth it if `kversion` is later just used once?

* This whole section looks odd too me:
```
%define specversion 5.18.0
%define patchversion 5.18
%define pkgrelease 0.rc6.47.test
%define kversion 5
%define tarfile_release 5.18-rc6
# This is needed to do merge window version magic
%define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc6.47%{?buildid}%{?dist}

#
# End of genspec.sh variables
#

%define pkg_release %{specrelease}
```

Having both `pkgrelease` and `pkg_release` with slightly different contents
for example is confusing. And why are we defining `specrelease` just to assign
it to `pkg_release` a little later? And there is so much redundancy here, if
someone wants to change the spec file directly downstream (say from a SRPM)
this gets hard.

To illustrate what I mean: shouldn't the section above maybe look more like
this (untested! just for illustration!)?

```
%define kversion 5
%define patchlevel 18
%define patchversion %{kversion}.%{patchlevel}
%define specversion %{patchversion}.0
%define pkgrelease 0.rc6.47.test
%define tarfile_release %{patchversion}-rc6
#
# End of genspec.sh variables
#

%define pkg_release 0.rc6.47%{?buildid}%{?dist}
```

Still not nice and definitely won't cover quite a few use cases, but as I
said: I just wanted to illustrate how things could look a bit easier to
understand in the resulting spec file.
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCHv2 9/17] redhat/kernel.spec.template: Move genspec variables into one section

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/kernel.spec.template: Move genspec variables into one section

Move the genspec variables into one section. This re-introduces the
SPECKVERSION variable into the specfile.

Additional fix: add a tarfile_release variable that maps to
SPECTARFILE_RELEASE.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3,13 +3,6 @@
 # environment changes that affect %%install need to go
 # here before the %%install macro is pre-built.
 
-# Include Fedora files
-%global include_fedora %%SPECINCLUDE_FEDORA_FILES%%
-# Include RHEL files
-%global include_rhel %%SPECINCLUDE_RHEL_FILES%%
-# Provide Patchlist.changelog file
-%global patchlist_changelog %%SPECPATCHLIST_CHANGELOG%%
-
 # Disable LTO in userspace packages.
 %global _lto_cflags %{nil}
 
@@ -72,21 +65,6 @@
 %endif
 
 Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-#  kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-#  unreleased kernel development snapshot.
-%global released_kernel %%SPECRELEASED_KERNEL%%
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-#  (on supported architectures). The kernel-debug-* subpackages will
-#  contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-#  to build the base kernel using the debug configuration. (Specifying
-#  the --with-release option overrides this setting.)
-%define debugbuildsenabled %%SPECDEBUG_BUILDS_ENABLED%%
-
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
 %else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
 # for parallel xz processes, replace with 1 to go back to single process
 %endif
 
-%%SPECBUILDID%%
-
-
 %if 0%{?fedora}
 %define primary_target fedora
 %else
 %define primary_target rhel
 %endif
 
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora %%SPECINCLUDE_FEDORA_FILES%%
+# Include RHEL files
+%global include_rhel %%SPECINCLUDE_RHEL_FILES%%
+# Provide Patchlist.changelog file
+%global patchlist_changelog %%SPECPATCHLIST_CHANGELOG%%
+# Set released_kernel to 1 when the upstream source tarball contains a
+#  kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+#  unreleased kernel development snapshot.
+%global released_kernel %%SPECRELEASED_KERNEL%%
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+#  (on supported architectures). The kernel-debug-* subpackages will
+#  contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+#  to build the base kernel using the debug configuration. (Specifying
+#  the --with-release option overrides this setting.)
+%define debugbuildsenabled %%SPECDEBUG_BUILDS_ENABLED%%
+%%SPECBUILDID%%
 %define specversion %%SPECVERSION%%
 %define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
 %define pkgrelease %%SPECBUILD%%
-
+%define kversion %%SPECKVERSION%%
+%define tarfile_release %%SPECTARFILE_RELEASE%%
 # This is needed to do merge window version magic
 %define patchlevel %%SPECKPATCHLEVEL%%
-
 # allow pkg_release to have configurable %%{?dist} tag
 %define specrelease %%SPECRELEASE%%
 
+#
+# End of genspec.sh variables
+#
+
 %define pkg_release %{specrelease}
 
 # libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-%%SPECTARFILE_RELEASE%%.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1352,7 +1354,7 @@ ApplyPatch()
 exit 1
   fi
   if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ; 
then
-if [ "${patch:0:8}" != "patch-%%SPECKVERSION%%." ] ; then
+if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
   echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
   exit 1
 fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-%%SPECTARFILE_RELEASE%% -c
-mv linux-%%SPECTARFILE_RELEASE%% linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec 
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -3,13 +3,6 @@
 # environment changes that affect %%install need to go
 # here before the %%install macro is pre-built.
 
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file

[OS-BUILD PATCHv2 16/17] redhat/Makefile: Rename PREBUILD to UPSTREAMBUILD

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Rename PREBUILD to UPSTREAMBUILD

PREBUILD isn't a good name for this variable.  It is the portion of the
string that references upstream build information.  Rename it to
UPSTREAMBUILD.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -25,6 +25,12 @@ ifdef SINGLE_TARBALL
   $(warning WARNING: SINGLE_TARBALL will be deprecated in a later release.)
 endif
 
+ifdef PREBUILD_GIT_ONLY
+  # deprecated in 5.18.0
+  $(warning WARNING: PREBUILD_GIT_ONLY will be deprecated in a later release, 
use UPSTREAMBUILD_GIT_ONLY instead.)
+  UPSTREAMBUILD_GIT_ONLY:=$(PREBUILD_GIT_ONLY)
+endif
+
 include Makefile.variables
 # These entries are 'duplicates' of variables specified in Makefile.variables
 # that are used in the SPEC file.  Specifying these with a SPEC prefix 
indicates
@@ -147,7 +153,7 @@ endif
 # SPECKEXTRAVERSION, and SPECKSUBLEVEL from the top-level kernel makefile as
 # opposed to any adjusted version for snapshotting.
 ifneq ($(SPECKEXTRAVERSION),)
-  PREBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
+  UPSTREAMBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
   UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
 else
   ifeq ($(SPECKSUBLEVEL),0)
@@ -159,7 +165,7 @@ else
 # *NOT* equivalent to the SPECVERSION variable.
 UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
   endif
-  PREBUILD:=
+  UPSTREAMBUILD:=
 endif
 MARKER:=v$(UPSTREAM_TARBALL_NAME)
 
@@ -193,22 +199,22 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
 # packaging. Fix this by bumping the patch level and marking
 # this as rc0
 ifeq ($(SPECKEXTRAVERSION),)
-  PREBUILD:=0.rc0.
+  UPSTREAMBUILD:=0.rc0.
   SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1)
 endif
-ifndef PREBUILD_GIT_ONLY
+ifndef UPSTREAMBUILD_GIT_ONLY
   ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
-PREBUILD_GIT_ONLY:=0
+UPSTREAMBUILD_GIT_ONLY:=0
   else
-PREBUILD_GIT_ONLY:=1
+UPSTREAMBUILD_GIT_ONLY:=1
   endif
 endif
-ifeq ($(PREBUILD_GIT_ONLY),1)
-  PREBUILD:=$(PREBUILD)$(MARKER).
+ifeq ($(UPSTREAMBUILD_GIT_ONLY),1)
+  UPSTREAMBUILD:=$(UPSTREAMBUILD)$(MARKER).
 else
   # Obtain the date that HEAD was committed (not the snapshot commit).
   HEAD_DATE:=$(shell $(GIT) show -s --format=%cd --date=format:%Y%m%d 
$(HEAD))
-  PREBUILD:=$(PREBUILD)$(HEAD_DATE)git$(MARKER).
+  UPSTREAMBUILD:=$(UPSTREAMBUILD)$(HEAD_DATE)git$(MARKER).
 endif
 UPSTREAM_TARBALL_NAME:=$(patsubst v%,%,$(_TAG))
   endif
@@ -220,7 +226,7 @@ endif
 # The NVR looks like, for example, 
kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35.
 # This string can be deconstructed as
 #
-# 
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(LOCALVERSION)$(DIST)
+# 
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(UPSTREAMBUILD)$(BUILD)$(LOCALVERSION)$(DIST)
 #
 # This can be evaluated as
 #
@@ -229,7 +235,7 @@ endif
 # $(PACKAGE_NAME)-$(BASEVERSION)   
 $(DIST)
 # $(RELEASETAG)
 $(DIST)
 #
-SPECBUILD:=$(PREBUILD)$(BUILD)$(LOCALVERSION)
+SPECBUILD:=$(UPSTREAMBUILD)$(BUILD)$(LOCALVERSION)
 SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
 BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
 RELEASETAG:=$(PACKAGE_NAME)-$(BASEVERSION)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -102,7 +102,7 @@ BUILD ?=
 # failing because the UTS_RELEASE field exceeded 64 chars.  This variable can
 # be set to 1 to decrease the kernel UTS_RELEASE and SPECBUILD by 11 characters
 # (MMDDgit).
-PREBUILD_GIT_ONLY ?=
+UPSTREAMBUILD_GIT_ONLY ?=
 
 # This overrides the default git repository for the distg-* targets.  See
 # the 'make dist-full-help' entry for distg-brew for information on setting
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -31,7 +31,7 @@ fi
 
 # The SPECRELEASE variable uses the SPECBUILDID variable which is
 # defined above.  IOW, don't remove SPECBUILDID ;)
-SPECRELEASE="${PREBUILD}""${BUILD}""%{?buildid}%{?dist}"
+SPECRELEASE="${UPSTREAMBUILD}""${BUILD}""%{?buildid}%{?dist}"
 
 EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
:(exclude,top).gitattributes \
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile

[OS-BUILD PATCHv2 17/17] self-test/data/create-data.sh: Avoid SINGLE_TARBALL warning

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

self-test/data/create-data.sh: Avoid SINGLE_TARBALL warning

'make dist-self-test-data' outputs the warning "Makefile:25: WARNING:
SINGLE_TARBALL will be deprecated in a later release."

Unset the parameter before the make calls.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/create-data.sh 
b/redhat/self-test/data/create-data.sh
index blahblah..blahblah 100755
--- a/redhat/self-test/data/create-data.sh
+++ b/redhat/self-test/data/create-data.sh
@@ -29,6 +29,7 @@ do
# UPSTREAM is the base merge commit and can change from 
day-to-day as
# the tree is changed.  Omit UPSTREAM from the output.
# RHEL_RELEASE can change build-to-build.
+   unset SINGLE_TARBALL
make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}" 
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w 
UPSTREAM | grep -v -w RHEL_RELEASE >& "${varfilename}"
 
# When executed from a script, the variables in 
Makefile.variables are
@@ -47,6 +48,7 @@ do
done >> "${varfilename}"
 
echo "building ${varfilename}.spec"
+   unset SINGLE_TARBALL
make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}" 
HEAD=${commit} setup-source
cp "${SOURCES}"/kernel.spec "${varfilename}".spec
done
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 
b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
 RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -96,4

[OS-BUILD PATCHv2 14/17] redhat/Makefile: Fix dist-brew & distg-brew targets

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Fix dist-brew & distg-brew targets

The dist-brew and distg-brew targets always require some variable
manipulation on the command line.  Hardcode DIST, DISTRO, and
SCRATCH_TARGET to always create a "RHEL9" brew build.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -656,9 +656,11 @@ dist-vr-check:
exit 1; \
fi
 
+dist-brew: DIST=.el9 DISTRO=rhel BUILD_TARGET="--scratch 
rhel-$(RHEL_MAJOR).1.0-test-pesign"
 dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) 
$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm $(OUTPUT_FILE)
 
+distg-brew: DIST=.el9 DISTRO=rhel BUILD_TARGET="--scratch 
rhel-$(RHEL_MAJOR).1.0-test-pesign"
 distg-brew distg-koji: distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) 
"$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCHv2 12/17] redhat/scripts/new_release.sh: Use Makefile variables

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/scripts/new_release.sh: Use Makefile variables

Use Makefile variables in new_release.sh.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -607,7 +607,7 @@ dist-release-changed: setup-source
echo "Nothing changed, skipping updates"; \
else \
$(GIT) checkout -- $(REDHAT)/$(SPECCHANGELOG); \
-   $(REDHAT)/scripts/new_release.sh $(REDHAT) $(YSTREAM_FLAG) 
$(ZSTREAM_FLAG) $(BUMP_RELEASE); \
+   $(REDHAT)/scripts/new_release.sh; \
$(MAKE) dist-release-finish; \
fi
 
diff --git a/redhat/scripts/new_release.sh b/redhat/scripts/new_release.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/new_release.sh
+++ b/redhat/scripts/new_release.sh
@@ -1,20 +1,10 @@
 #!/bin/bash
-if [[ -z $1 || -z $2 ]]; then
-   echo "$(basename "$0")  " >&2;
-   exit 1;
-fi
-
-RHPATH="$1";
-YSTREAM_FLAG="$2";
-ZSTREAM_FLAG="$3";
-BUMP_RELEASE="$4";
-
-if [ -s "$RHPATH/linux-kernel-test.patch" ]; then
+if [ -s "$REDHAT/linux-kernel-test.patch" ]; then
echo "linux-kernel-test.patch is not empty, aborting" >&2;
exit 1;
 fi
 
-RELEASE=$(sed -n -e 's/^RHEL_RELEASE\ =\ \(.*\)/\1/p' 
"$RHPATH"/../Makefile.rhelver)
+RELEASE=$(sed -n -e 's/^RHEL_RELEASE\ =\ \(.*\)/\1/p' 
"$REDHAT"/../Makefile.rhelver)
 
 YVER=$(echo "$RELEASE" | cut -d "." -f 1)
 YVER=${YVER:="$RELEASE"}
@@ -29,15 +19,15 @@ elif [ "$ZSTREAM_FLAG" == "no" ]; then
if [ "$YSTREAM_FLAG" == "yes" ]; then
NEW_RELEASE="$((RELEASE + 1))";
else
-   EARLY_YBUILD=$(sed -n -e 's/^EARLY_YBUILD:=\(.*\)/\1/p' 
"$RHPATH"/../Makefile.rhelver);
-   EARLY_YRELEASE=$(sed -n -e 's/^EARLY_YRELEASE:=\(.*\)/\1/p' 
"$RHPATH"/../Makefile.rhelver);
+   EARLY_YBUILD=$(sed -n -e 's/^EARLY_YBUILD:=\(.*\)/\1/p' 
"$REDHAT"/../Makefile.rhelver);
+   EARLY_YRELEASE=$(sed -n -e 's/^EARLY_YRELEASE:=\(.*\)/\1/p' 
"$REDHAT"/../Makefile.rhelver);
if [ "$EARLY_YBUILD" != "$RELEASE" ]; then
NEW_EARLY_YRELEASE=1;
else
NEW_EARLY_YRELEASE="$((EARLY_YRELEASE + 1))";
fi
-   sed -i -e 
"s/^EARLY_YBUILD:=$EARLY_YBUILD/EARLY_YBUILD:=$RELEASE/" 
"$RHPATH"/../Makefile.rhelver;
-   sed -i -e 
"s/^EARLY_YRELEASE:=$EARLY_YRELEASE/EARLY_YRELEASE:=$NEW_EARLY_YRELEASE/" 
"$RHPATH"/../Makefile.rhelver;
+   sed -i -e 
"s/^EARLY_YBUILD:=$EARLY_YBUILD/EARLY_YBUILD:=$RELEASE/" 
"$REDHAT"/../Makefile.rhelver;
+   sed -i -e 
"s/^EARLY_YRELEASE:=$EARLY_YRELEASE/EARLY_YRELEASE:=$NEW_EARLY_YRELEASE/" 
"$REDHAT"/../Makefile.rhelver;
NEW_RELEASE=$RELEASE;
fi
 elif [ "$ZSTREAM_FLAG" == "yes" ]; then
@@ -49,5 +39,5 @@ else
exit 1;
 fi
 
-sed -i -e "s/RHEL_RELEASE\ =.*/RHEL_RELEASE\ =\ $NEW_RELEASE/" 
"$RHPATH"/../Makefile.rhelver;
+sed -i -e "s/RHEL_RELEASE\ =.*/RHEL_RELEASE\ =\ $NEW_RELEASE/" 
"$REDHAT"/../Makefile.rhelver;
 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCHv2 15/17] redhat/Makefile: Rename BUILDID to LOCALVERSION

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Rename BUILDID to LOCALVERSION

BUILDID isn't a very descriptive name.  Rename the variable to
LOCALVERSION.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -116,13 +116,13 @@ endif
 LOCVERFILE:=../localversion
 # create an empty localversion file if you don't want a local buildid
 ifneq ($(wildcard $(LOCVERFILE)),)
-  BUILDID:=$(shell cat $(LOCVERFILE))
-  $(info BUILDID is "$(BUILDID)". Update '$(shell dirname 
$(REDHAT))/localversion' to change.)
+  LOCALVERSION:=$(shell cat $(LOCVERFILE))
+  $(info LOCALVERSION is "$(LOCALVERSION)". Update '$(shell dirname 
$(REDHAT))/localversion' to change.)
 else
-  ifeq ($(BUILDID),)
-BUILDID:=.test
+  ifeq ($(LOCALVERSION),)
+LOCALVERSION:=.test
   endif
-  $(info BUILDID is "$(BUILDID)".)
+  $(info LOCALVERSION is "$(LOCALVERSION)".)
 endif
 
 # options for process_configs.sh script
@@ -220,7 +220,7 @@ endif
 # The NVR looks like, for example, 
kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35.
 # This string can be deconstructed as
 #
-# 
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(BUILDID)$(DIST)
+# 
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(LOCALVERSION)$(DIST)
 #
 # This can be evaluated as
 #
@@ -229,7 +229,7 @@ endif
 # $(PACKAGE_NAME)-$(BASEVERSION)   
 $(DIST)
 # $(RELEASETAG)
 $(DIST)
 #
-SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
+SPECBUILD:=$(PREBUILD)$(BUILD)$(LOCALVERSION)
 SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
 BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
 RELEASETAG:=$(PACKAGE_NAME)-$(BASEVERSION)
@@ -573,7 +573,7 @@ dist-all-rpms: dist-sources do-rpmbuild
 dist-srpm: RPMBUILDOPTS=--nodeps -bs
 dist-srpm: dist-sources do-rpmbuild
 
-dist-srpm-gcov: BUILDID=".gcov"
+dist-srpm-gcov: LOCALVERSION=".gcov"
 dist-srpm-gcov: BUILDOPTS+="+gcov"
 dist-srpm-gcov: dist-srpm
 
@@ -652,7 +652,7 @@ dist-vr-check:
@# version-release string with max 64 chars.  The version-release for 
s390x+zfcpdump
@# is 29 characters, leaving a maximum of 35 characters for SPECBUILD.
@if [ $$(echo -n $(SPECBUILD) | wc -c) -gt 35 ]; then \
-   echo "SPECBUILD ($(SPECBUILD)) is too long.  Use a shorter 
localversion (currently $(BUILDID))"; \
+   echo "SPECBUILD ($(SPECBUILD)) is too long.  Use a shorter 
localversion (currently $(LOCALVERSION))"; \
exit 1; \
fi
 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCHv2 13/17] redhat/Makefile: Reorganize MARKER code

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Reorganize MARKER code

Reorganize the MARKER code.  MARKER is always UPSTREAM_TARBALL_NAME
prefixed with a 'v'.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -142,26 +142,26 @@ ifeq ("$(origin O)", "command line")
   _EXTRA_ARGS := O=$(_OUTPUT)
 endif
 
-# MARKER is the git tag which we base off of for exporting patches
-# Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL and SPECKEXTRAVERSION
-# from makefile as opposed to any adjusted version for snapshotting.
+# MARKER is the upstream git tag which we base off of for exporting patches.
+# MARKER (and UPSTREAM_TARBALL_NAME) must use SPECKVERSION, SPECKPATCHLEVEL,
+# SPECKEXTRAVERSION, and SPECKSUBLEVEL from the top-level kernel makefile as
+# opposed to any adjusted version for snapshotting.
 ifneq ($(SPECKEXTRAVERSION),)
-  MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
   PREBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
   UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
 else
   ifeq ($(SPECKSUBLEVEL),0)
-MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)
 UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)
   else
-# Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL, and SPECKSUBLEVEL
-# from the kernel makefile as opposed to any adjusted version for 
snapshotting.
-# IOW, these variables are *NOT* equivalent to the SPECVERSION variable.
-MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
+# MARKER (and UPSTREAM_TARBALL_NAME) must use SPECKVERSION,
+# SPECKPATCHLEVEL, and SPECKSUBLEVEL from the top-level kernel makefile as
+# opposed to any adjusted version for snapshotting.  IOW, these variables 
are
+# *NOT* equivalent to the SPECVERSION variable.
 UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
   endif
   PREBUILD:=
 endif
+MARKER:=v$(UPSTREAM_TARBALL_NAME)
 
 # If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based
 # on a branch tracking upstream. This allows for generating rpms

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCHv2 11/17] redhat/Makefile: Rename YSTREAM and ZSTREAM

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Rename __YSTREAM and __ZSTREAM

The __YSTREAM and __ZSTREAM names can be replaced with YSTREAM_FLAG and
ZSTREAM_FLAG.  This makes future changes easier.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -283,19 +283,19 @@ TARBALL:=$(REDHAT)/$(TARFILE)
 include Makefile.rhpkg
 
 ifeq ("$(ZSTREAM)", "yes")
-  __YSTREAM = no
+  YSTREAM_FLAG = no
   ifeq ("$(origin RHDISTGIT_BRANCH)", "command line")
-__ZSTREAM = branch
+ZSTREAM_FLAG = branch
   else
-__ZSTREAM = yes
+ZSTREAM_FLAG = yes
   endif
   BUILDOPTS += +kabidupchk
 else
-  __ZSTREAM = no
+  ZSTREAM_FLAG = no
   ifeq ("$(EARLY_YSTREAM)", "yes")
-__YSTREAM = early
+YSTREAM_FLAG = early
   else
-__YSTREAM = yes
+YSTREAM_FLAG = yes
   endif
 endif
 
@@ -607,7 +607,7 @@ dist-release-changed: setup-source
echo "Nothing changed, skipping updates"; \
else \
$(GIT) checkout -- $(REDHAT)/$(SPECCHANGELOG); \
-   $(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) 
$(__ZSTREAM) $(BUMP_RELEASE); \
+   $(REDHAT)/scripts/new_release.sh $(REDHAT) $(YSTREAM_FLAG) 
$(ZSTREAM_FLAG) $(BUMP_RELEASE); \
$(MAKE) dist-release-finish; \
fi
 
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
+YSTREAM_FLAG=yes 
+ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5 
-__YSTREAM=yes 
-__ZSTREAM=no 
 DIST_BRANCH="os-build"
 DIST=.el7
 DISTRO=centos
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
+YSTREAM_FLAG=yes 
+ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5 
-__YSTREAM=yes 
-__ZSTREAM=no 
 DIST_BRANCH="os-build"
 DIST=.fc25
 DISTRO=centos
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
+YSTREAM_FLAG=yes 
+ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-11523-g78e36f3b0dae586 
-__YSTREAM=yes 
-__ZSTREAM=no 
 DIST_BRANCH="os-build"
 DIST=.el7
 DISTRO=centos
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
+YSTREAM_FLAG=yes 
+ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-11523-g78e36f3b0dae586 
-__YSTREAM=yes 
-__ZSTREAM=no 
 DIST_BRANCH="os-build"
 DIST=.fc25
 DISTRO=centos
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
+YSTREAM_FLAG=yes 
+ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16 
-__YSTREAM=yes 
-__ZSTREAM=no 
 DIST_BRANCH="os-build"
 DIST=.el7
 DISTRO=centos
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
+YSTREAM_FLAG=yes 
+ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16 
-__YSTREAM=yes 
-__ZSTREAM=no 
 DIST_BRANCH="os-build"
 DIST=.fc25
 DISTRO=centos
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
 VERSION_ON_UPSTREAM=1

[OS-BUILD PATCHv2 10/17] redhat/genspec.sh: Add comment about SPECBUILDID variable

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/genspec.sh: Add comment about SPECBUILDID variable

Add a comment about the non-obvious use of SPECBUILDID in
the specfile.  Move the definition of SPECRELEASE to a
better location.

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
@@ -29,6 +29,10 @@ else
SPECBUILDID="# define buildid .local"
 fi
 
+# The SPECRELEASE variable uses the SPECBUILDID variable which is
+# defined above.  IOW, don't remove SPECBUILDID ;)
+SPECRELEASE="${PREBUILD}""${BUILD}""%{?buildid}%{?dist}"
+
 EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
:(exclude,top).gitattributes \
:(exclude,top).gitignore \
@@ -56,8 +60,6 @@ if [ "$PATCHLIST_URL" != "none" ]; then
SPECPATCHLIST_CHANGELOG=1
 fi
 
-SPECRELEASE="${PREBUILD}""${BUILD}""%{?buildid}%{?dist}"
-
 # self-test begin
 test -f "$SOURCES/$SPECFILE" &&
sed -i -e "

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCHv2 8/17] redhat/kernel.spec.template: Remove kversion

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/kernel.spec.template: Remove kversion

Remove kversion.  It is unused.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
-
 %define specversion %%SPECVERSION%%
 %define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
 %define pkgrelease %%SPECBUILD%%
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec 
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion 5.16
-
 %define specversion 5.16.0
 %define patchversion 5.16
 %define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec 
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion 5.16
-
 %define specversion 5.16.0
 %define patchversion 5.16
 %define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec 
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion 5.17
-
 %define specversion 5.17.0
 %define patchversion 5.17
 %define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec 
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion 5.17
-
 %define specversion 5.17.0
 %define patchversion 5.17
 %define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec 
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion 5.16
-
 %define specversion 5.16.0
 %define patchversion 5.16
 %define pkgrelease 6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec 
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion 5.16
-
 %define specversion 5.16.0
 %define patchversion 5.16
 %define pkgrelease 6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec 
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion 5.16
-
 %define specversion 5.16.0
 %define patchversion 5.16
 %define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec 
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-# The kernel tarball/base version
-%define kversion 5.16
-
 %define specversion 5.16.0
 %define patchversion 5.16
 %define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec 
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
 %define primary_target rhel

[OS-BUILD PATCHv2 7/17] redhat/Makefile: Add SPECTARFILE_RELEASE comment

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Add SPECTARFILE_RELEASE comment

Add comment about the SPECTARFILE_RELEASE variable.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -246,11 +246,14 @@ 
KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(BASEVERSION).tar.bz2
 #
 ifeq ("$(DISTRO)", "fedora")
   SINGLE_TARBALL:=0
-  SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
   RHDISTGIT_BRANCH:=rawhide
   ifndef BUILD_SCRATCH_TARGET
 BUILD_SCRATCH_TARGET:=temp-ark-rhel-8-test
   endif
+  # The Fedora tarfile name is based on an upstream tag as users may
+  # replace the tarball from one with upstream, rebuild, and then deploy
+  # without changing anything else in the specfile.
+  SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
 else ifeq ("$(DISTRO)", "centos")
   SINGLE_TARBALL:=1
   RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCHv2 4/17] redhat/Makefile: Move SPECRELEASE to genspec.sh

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Move SPECRELEASE to genspec.sh

Move SPECRELEASE to genspec.sh.  It is the only place it is used.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -234,7 +234,6 @@ 
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
 RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
 RELEASETAG:=$(PACKAGE_NAME)-$(RPMVERSION)
 SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
-SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
 
 # kabi variables
 KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -56,6 +56,8 @@ if [ "$PATCHLIST_URL" != "none" ]; then
SPECPATCHLIST_CHANGELOG=1
 fi
 
+SPECRELEASE="${PREBUILD}""${BUILD}""%{?buildid}%{?dist}"
+
 # self-test begin
 test -f "$SOURCES/$SPECFILE" &&
sed -i -e "
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
 SPECKPATCHLEVEL=16 
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
 SPECRELEASED_KERNEL=0 
 SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test 
 SPECVERSION=5.16.0 
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
 SPECKPATCHLEVEL=16 
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
 SPECRELEASED_KERNEL=0 
 SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test 
 SPECVERSION=5.16.0 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
 SPECKPATCHLEVEL=17 
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
 SPECRELEASED_KERNEL=0 
 SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SPECVERSION=5.17.0 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
 SPECKPATCHLEVEL=17 
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
 SPECRELEASED_KERNEL=0 
 SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SPECVERSION=5.17.0 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
 SPECKPATCHLEVEL=16 
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
-SPECRELEASE=6%{?buildid}%{?dist} 
 SPECRELEASED_KERNEL=0 
 SPECTARFILE_RELEASE=5.16.0-6.test 
 SPECVERSION=5.16.0 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
 SPECKPATCHLEVEL=16 
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
-SPECRELEASE=6%{?buildid}%{?dist} 
 SPECRELEASED_KERNEL=0 
 SPECTARFILE_RELEASE=5.16.0-6.test 
 SPECVERSION=5.16.0 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
 SPECKPATCHLEVEL=16 
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
 SPECRELEASED_KERNEL=0 
 SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SPECVERSION=5.16.0 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
 SPECKPATCHLEVEL=16 
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
 SPECRELEASED_KERNEL=0 
 SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SPECVERSION=5.16.0 
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 
b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index

[OS-BUILD PATCHv2 6/17] redhat/Makefile: Rename RPMVERSION to BASEVERSION

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Rename RPMVERSION to BASEVERSION

RPMVERSION is the rpm NVR without the dist tag.  It is not the RPM
version so RPMVERSION is not an accurate name for this field.

Rename RPMVERSION to BASEVERSION.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -226,19 +226,19 @@ endif
 #
 # 
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD)
  $(DIST)
 # $(PACKAGE_NAME)-$(SPECVERSION) 
-$(SPECBUILD)  $(DIST)
-# $(PACKAGE_NAME)-$(RPMVERSION)
 $(DIST)
+# $(PACKAGE_NAME)-$(BASEVERSION)   
 $(DIST)
 # $(RELEASETAG)
 $(DIST)
 #
 SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
 SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
-RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
-RELEASETAG:=$(PACKAGE_NAME)-$(RPMVERSION)
+BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
+RELEASETAG:=$(PACKAGE_NAME)-$(BASEVERSION)
 SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
 
 # kabi variables
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(BASEVERSION).tar.bz2
 KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(RPMVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(BASEVERSION).tar.bz2
 
 #
 # This conditional statement is where fedora, centos, and other (aka RHEL)
@@ -260,14 +260,14 @@ else ifeq ("$(DISTRO)", "centos")
   ifndef BUILD_SCRATCH_TARGET
 BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
   endif
-  SPECTARFILE_RELEASE:=$(RPMVERSION)
+  SPECTARFILE_RELEASE:=$(BASEVERSION)
 else
   SINGLE_TARBALL:=1
   RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
   ifndef BUILD_SCRATCH_TARGET
 BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
   endif
-  SPECTARFILE_RELEASE:=$(RPMVERSION)
+  SPECTARFILE_RELEASE:=$(BASEVERSION)
 endif
 
 ifndef BUILD_TARGET
@@ -450,12 +450,12 @@ dist-tarball: $(TARBALL)
 dist-kernelrelease:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
-   @echo $(PACKAGE_NAME)-$(RPMVERSION)
+   @echo $(PACKAGE_NAME)-$(BASEVERSION)
 
 dist-kernelversion:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
-   @echo $(RPMVERSION)
+   @echo $(BASEVERSION)
 
 dist-specfile: setup-source
# deprecated at 5.17.0
@@ -492,7 +492,7 @@ setup-source: dist-git-version-check dist-clean-sources
@if [ -z "$(RHSELFTESTDATA)" ]; then \
cp $(REDHAT)/$(SPECCHANGELOG) $(SOURCES)/$(SPECCHANGELOG); \
else \
-   echo "Mon Mar 28 2022 Fedora Kernel Team 
 [$(RPMVERSION)]" > $(SOURCES)/$(SPECCHANGELOG); 
\
+   echo "Mon Mar 28 2022 Fedora Kernel Team 
 [$(BASEVERSION)]" > 
$(SOURCES)/$(SPECCHANGELOG); \
fi
@if [ -z "$(PATCHLIST_URL)" ]; then \
echo "Error: PATCHLIST_URL must be set (to 'none' or any URL)"; 
\
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -113,7 +113,7 @@ echo "Gathering new log entries since $lasttag"
 
 cname="$(git var GIT_COMMITTER_IDENT |sed 's/>.*/>/')"
 cdate="$(LC_ALL=C date +"%a %b %d %Y")"
-cversion="[$RPMVERSION]";
+cversion="[$BASEVERSION]";
 echo "* $cdate $cname $cversion" > "$clogf"
 
 git log --topo-order --no-merges -z "$GIT_NOTES" "$GIT_FORMAT" \
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -52,7 +52,7 @@ diff -X "$REDHAT"/git/dontdiff -upr "$tmpdir/$PACKAGE_NAME" 
"$REDHAT"/rpm/SOURCE
 # creating the changelog file
 
 # changelog has been created by genspec.sh, including Resolves line, just copy 
it here
-echo -e "${PACKAGE_NAME}-${RPMVERSION}\n" > "$tmpdir"/changelog
+echo -e "${PACKAGE_NAME}-${BASEVERSION}\n" > "$tmpdir"/changelog
 awk '1;/^Resolves: /{exit};' "$REDHAT"/"$SPECCHANGELOG" >> "$tmpdir"/changelog
 
 # all done
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -2,6 +2,7 @@
 .SHELLSTATUS=1 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BASEVERSION=5.16.0-0.rc5.6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-RPMVERSION=5.16.0-0.rc5.6.test 
 SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
diff --git

[OS-BUILD PATCHv2 3/17] redhat/Makefile: Add kernel-NVR comment

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Add kernel-NVR comment

Add a comment explaining the variables used in constructing the kernel
package's NVR, and reorganize the variables.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -216,14 +216,30 @@ else
   SNAPSHOT:=0
 endif
 
-SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
+# This section contains the variables that represent the kernel rpm's NVR.
+# The NVR looks like, for example, 
kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35.
+# This string can be deconstructed as
+#
+# 
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(BUILDID)$(DIST)
+#
+# This can be evaluated as
+#
+# 
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD)
  $(DIST)
+# $(PACKAGE_NAME)-$(SPECVERSION) 
-$(SPECBUILD)  $(DIST)
+# $(PACKAGE_NAME)-$(RPMVERSION)
 $(DIST)
+# $(RELEASETAG)
 $(DIST)
+#
 SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(SPECBUILD).tar.bz2
-KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(SPECBUILD).tar.bz2
+SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
 RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
+RELEASETAG:=$(PACKAGE_NAME)-$(RPMVERSION)
+SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
 SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
-SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm
+
+# kabi variables
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2
+KABIDW := $(REDHAT)/kabi-dwarf
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(RPMVERSION).tar.bz2
 
 #
 # This conditional statement is where fedora, centos, and other (aka RHEL)
@@ -436,12 +452,12 @@ dist-tarball: $(TARBALL)
 dist-kernelrelease:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
-   @echo $(PACKAGE_NAME)-$(SPECVERSION)-$(SPECBUILD)
+   @echo $(PACKAGE_NAME)-$(RPMVERSION)
 
 dist-kernelversion:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
-   @echo $(SPECVERSION)-$(SPECBUILD)
+   @echo $(RPMVERSION)
 
 dist-specfile: setup-source
# deprecated at 5.17.0
@@ -580,7 +596,7 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/marker
-   @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker 
$(REDHAT)/$(SPECCHANGELOG) $(SPECFILE).template -m "[redhat] 
$(PACKAGE_NAME)-$(RPMVERSION)"
+   @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker 
$(REDHAT)/$(SPECCHANGELOG) $(SPECFILE).template -m "[redhat] $(RELEASETAG)"
 dist-release-changed: setup-source
@cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@@ -596,7 +612,7 @@ dist-release-changed: setup-source
 dist-release: dist-clean-sources
@$(MAKE) dist-release-changed
 dist-release-tag:
-   @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(RPMVERSION)" 
$(PACKAGE_NAME)-$(RPMVERSION)
+   @$(GIT) tag -a -m "$(RELEASETAG)" $(RELEASETAG)
 
 git-tree-check:
@if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote get-url 
gitlab 2>/dev/null)"; then \
@@ -638,7 +654,7 @@ dist-vr-check:
fi
 
 dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
-   $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) 
$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm $(OUTPUT_FILE)
+   $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) 
$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm $(OUTPUT_FILE)
 
 distg-brew distg-koji: distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) 
"$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -95,7 +95,7 @@ fi
 GIT_FORMAT="--format=- %s (%an)%n%N%n^^^NOTES-END^^^%n%b"
 GIT_NOTES="--notes=refs/notes/${RHEL_MAJOR}.${RHEL_MINOR}*"
 
-lasttag=$(git rev-list --first-parent --grep="^\[redhat\] 
kernel-${SPECKVERSION}.${SPECKPATCHLEVEL}" --max-count=1 HEAD)
+lasttag=$(git rev-list --first-parent --grep="^\[redhat\] ${RELEASETAG}" 
--max-count=1 HEAD)
 # if we didn't find the proper tag, assume this is the first release
 if [[ -z $lasttag ]]; then
 if [[ -z ${MARKER//[0-9a-f]/} ]]; then
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++

[OS-BUILD PATCHv2 5/17] redhat/Makefile: Target whitespace cleanup

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Target whitespace cleanup

Some simple whitespace cleanups.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -442,7 +442,6 @@ $(KABIDW_TARBALL):
fi
@(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
 
-
 dist-tarball: $(TARBALL)
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
@@ -608,8 +607,10 @@ dist-release-changed: setup-source
$(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) 
$(__ZSTREAM) $(BUMP_RELEASE); \
$(MAKE) dist-release-finish; \
fi
+
 dist-release: dist-clean-sources
@$(MAKE) dist-release-changed
+
 dist-release-tag:
@$(GIT) tag -a -m "$(RELEASETAG)" $(RELEASETAG)
 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCHv2 2/17] redhat/Makefile: Use SPECFILE variable

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Use SPECFILE variable

Use the SPECFILE variable throughout the Makefiles.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -548,7 +548,7 @@ dist-test-patch: generate-testpatch-tmp
@mv $(TESTPATCH).tmp $(TESTPATCH);
 
 do-rpmbuild: dist-sources
-   $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir 
$(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" 
--define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" $(RPMBUILDOPTS) 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+   $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir 
$(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" 
--define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" $(RPMBUILDOPTS) 
$(RPM)/SOURCES/$(SPECFILE)
 
 dist-all-rpms: RPMBUILDOPTS=--target $(MACH) -ba
 dist-all-rpms: dist-sources do-rpmbuild
@@ -580,7 +580,7 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/marker
-   @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker 
$(REDHAT)/$(SPECCHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] 
$(PACKAGE_NAME)-$(RPMVERSION)"
+   @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker 
$(REDHAT)/$(SPECCHANGELOG) $(SPECFILE).template -m "[redhat] 
$(PACKAGE_NAME)-$(RPMVERSION)"
 dist-release-changed: setup-source
@cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@@ -643,8 +643,8 @@ dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
 distg-brew distg-koji: distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) 
"$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
 
-.PHONY: $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec
-$(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec:
+.PHONY: $(REDHAT)/rpm/SOURCES/$(SPECFILE)
+$(REDHAT)/rpm/SOURCES/$(SPECFILE):
@echo "dist-sources"
@$(MAKE) dist-sources
 
diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross
index blahblah..blahblah 100644
--- a/redhat/Makefile.cross
+++ b/redhat/Makefile.cross
@@ -26,46 +26,46 @@ dist-cross-download:
 
 dist-cross-aarch64-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
-   $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+   $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba 
$(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "aarch64"
 
 dist-cross-ppc64-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
-   $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+   $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba 
$(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "ppc64"
 
 dist-cross-s390x-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
-   $(CROSS_RPMFLAGS) --target s390x --with cross -ba 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+   $(CROSS_RPMFLAGS) --target s390x --with cross -ba 
$(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "s390x"
 
 dist-cross-all-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
-   $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
-   $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
-   $(CROSS_RPMFLAGS) --target s390x --with cross -ba 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
-   $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
+   $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba 
$(RPM)/SOURCES/$(SPECFILE)
+   $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba 
$(RPM)/SOURCES/$(SPECFILE)
+   $(CROSS_RPMFLAGS) --target s390x --with cross -ba 
$(RPM)/SOURCES/$(SPECFILE)
+   $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "aarch64 ppc64 s390x x86_64"
 
 dist-cross-aarch64-build: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
-   $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+   $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc 
$(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "aarch64"
 
 dist-cross-ppc64-build: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
-   $(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc 
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+   $(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc 
$(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "ppc64"

[OS-BUILD PATCHv2 1/17] redhat/Makefile: Remove KEXTRAVERSION

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava 

redhat/Makefile: Remove KEXTRAVERSION

KEXTRAVERSION isn't used for anything and can be removed.

Signed-off-by: Prarit Bhargava 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -147,11 +147,9 @@ endif
 # from makefile as opposed to any adjusted version for snapshotting.
 ifneq ($(SPECKEXTRAVERSION),)
   MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
-  KEXTRAVERSION:=$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./)
-  PREBUILD:=0$(KEXTRAVERSION).
+  PREBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
   UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
 else
-  KEXTRAVERSION:=
   ifeq ($(SPECKSUBLEVEL),0)
 MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)
 UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)
@@ -195,8 +193,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
 # packaging. Fix this by bumping the patch level and marking
 # this as rc0
 ifeq ($(SPECKEXTRAVERSION),)
-  KEXTRAVERSION:=.rc0
-  PREBUILD:=0$(KEXTRAVERSION).
+  PREBUILD:=0.rc0.
   SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1)
 endif
 ifndef PREBUILD_GIT_ONLY
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 
 
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 
 
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
 
 
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
 
-KEXTRAVERSION=.rc0 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
 
 
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
 
-KEXTRAVERSION=.rc0 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2 
 
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2 
-KEXTRAVERSION= 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2 
 
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2 
-KEXTRAVERSION= 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf

[OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757

Depends: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

This is a collection of various improvements and fixes for the redhat/Makefile
variables.  These fixes include renaming and reorganizing of variables, an
explanation of how the kernel NVR is constructed, and fixing the dist-brew &
distg-brew so they can be executed without specifying any extra variables.

Signed-off-by: Prarit Bhargava 

---
 redhat/scripts/new_release.sh   |   24 +--
 redhat/scripts/rh-dist-git.sh   |2 +-
 redhat/self-test/data/centos-2585cf9dfaad.el7   |   15 +-
 redhat/self-test/data/centos-2585cf9dfaad.el7.spec  |   65 -
 redhat/self-test/data/centos-2585cf9dfaad.fc25  |   15 +-
 redhat/self-test/data/centos-2585cf9dfaad.fc25.spec |   65 -
 redhat/self-test/data/centos-78e36f3b0dae.el7   |   16 +-
 redhat/self-test/data/centos-78e36f3b0dae.el7.spec  |   65 -
 redhat/self-test/data/centos-78e36f3b0dae.fc25  |   16 +-
 redhat/self-test/data/centos-78e36f3b0dae.fc25.spec |   65 -
 redhat/self-test/data/centos-df0cc57e057f.el7   |   15 +-
 redhat/self-test/data/centos-df0cc57e057f.el7.spec  |   65 -
 redhat/self-test/data/centos-df0cc57e057f.fc25  |   15 +-
 redhat/self-test/data/centos-df0cc57e057f.fc25.spec |   65 -
 redhat/self-test/data/centos-fce15c45d3fb.el7   |   16 +-
 redhat/self-test/data/centos-fce15c45d3fb.el7.spec  |   65 -
 redhat/self-test/data/centos-fce15c45d3fb.fc25  |   16 +-
 redhat/self-test/data/centos-fce15c45d3fb.fc25.spec |   65 -
 redhat/self-test/data/create-data.sh|2 +
 redhat/self-test/data/fedora-2585cf9dfaad.el7   |   15 +-
 redhat/self-test/data/fedora-2585cf9dfaad.el7.spec  |   65 -
 redhat/self-test/data/fedora-2585cf9dfaad.fc25  |   15 +-
 redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec |   65 -
 redhat/self-test/data/fedora-78e36f3b0dae.el7   |   16 +-
 redhat/self-test/data/fedora-78e36f3b0dae.el7.spec  |   65 -
 redhat/self-test/data/fedora-78e36f3b0dae.fc25  |   16 +-
 redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec |   65 -
 redhat/self-test/data/fedora-df0cc57e057f.el7   |   15 +-
 redhat/self-test/data/fedora-df0cc57e057f.el7.spec  |   65 -
 redhat/self-test/data/fedora-df0cc57e057f.fc25  |   15 +-
 redhat/self-test/data/fedora-df0cc57e057f.fc25.spec |   65 -
 redhat/self-test/data/fedora-fce15c45d3fb.el7   |   16 +-
 redhat/self-test/data/fedora-fce15c45d3fb.el7.spec  |   65 -
 redhat/self-test/data/fedora-fce15c45d3fb.fc25  |   16 +-
 redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec |   65 -
 redhat/self-test/data/rhel-2585cf9dfaad.el7 |   15 +-
 redhat/self-test/data/rhel-2585cf9dfaad.el7.spec|   65 -
 redhat/self-test/data/rhel-2585cf9dfaad.fc25|   15 +-
 redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec   |   65 -
 redhat/self-test/data/rhel-78e36f3b0dae.el7 |   16 +-
 redhat/self-test/data/rhel-78e36f3b0dae.el7.spec|   65 -
 redhat/self-test/data/rhel-78e36f3b0dae.fc25|   16 +-
 redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec   |   65 -
 redhat/self-test/data/rhel-df0cc57e057f.el7 |   15 +-
 redhat/self-test/data/rhel-df0cc57e057f.el7.spec|   65 -
 redhat/self-test/data/rhel-df0cc57e057f.fc25|   15 +-
 redhat/self-test/data/rhel-df0cc57e057f.fc25.spec   |   65 -
 redhat/self-test/data/rhel-fce15c45d3fb.el7 |   16 +-
 redhat/self-test/data/rhel-fce15c45d3fb.el7.spec|   65 -
 redhat/self-test/data/rhel-fce15c45d3fb.fc25|   16 +-
 redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec   |   65 -
 redhat/Makefile |  132 +++
 redhat/Makefile.cross   |   28 ++--
 redhat/Makefile.variables   |2 +-
 redhat/genspec.sh   |8 +-
 redhat/kernel.spec.template |   65 -
 56 files changed, 1089 insertions(+), 1106 deletions(-)
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

Re: [OS-BUILD PATCH 0/17] redhat/Makefile: General improvements and fixes

2022-05-12 Thread Prarit Bhargava (via Email Bridge)

From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757#note_944835271

>- [3/17] `030f50682c27` ("redhat/Makefile: Add kernel-NVR comment")
>
>  Is there any reason to make RELEASETAG variable a recursively expanded
variable instead of simply expanded variables, that is, using ```=```
assignment instead of ```:=```? (See eg. https://ftp.gnu.org/old-
gnu/Manuals/make-3.79.1/html_chapter/make_toc.html#TOC59). Mostly curious
because it should work either way.
>

No reason.  For consistency I've changed this to ":=".

>- [6/17] `df36fcdd089d` ("redhat/Makefile: Rename RPMVERSION to BASEVERSION")
>
>  You also need to change rh-dist-git.sh script to use BASEVERSION:
>
>  ```
>  redhat/scripts/rh-dist-git.sh:echo -e "${PACKAGE_NAME}-${RPMVERSION}\n" >
"$tmpdir"/changelog
>  ```

Fixed.

>
>- [7/17] `34fe4a6a439c` ("redhat/Makefile: General cleanup")
>
>  Probably you want the changelog here to be something like "Add comment
about the SPECTARFILE_RELEASE variable", instead of "General cleanup", because
it doesn't look a cleanup.

Fixed.

>
>- [9/17] `54a3fefd5b39` ("redhat/kernel.spec.template: Move genspec variables
into one section")
>
>  May add to the changelog here that you're also adding back the kversion
variable that maps to SPECKVERSION

Fixed.

>
>- [10/17] `357ddd348f6c` ("redhat/genspec.sh: Remove SPECBUILDID")
>
>  I think you need to drop this change, it is not true that SPECBUILD is not
used. It is used in the SPECRELEASE variable:
>
>  ```
>  redhat/genspec.sh:SPECRELEASE="${UPSTREAMBUILD}""${BUILD}""%{?buildid}%{?di
st}"
>  ```
>
>  This is replaced/used in the spec file.

I've changed this commit to add a comment about SPECBUILDID usage.

>
>  I remember buildid could be edited when building/patching directly in dist-
git,
>  support folks from CEE used to do test kernel builds for customers using
the
>  buildid variable in the spec.
>
>- [13/17] `274beb50dfe2` ("redhat/Makefile: Reorganize MARKER code")
>
>  I think you could go further here and do the assignment of MARKER once at
the end of if/endif condition and do ```MARKER:=v$(UPSTREAM_TARBALL_NAME)```
once. Also any reason of using ```=``` instead of ```:=``` as assignment
operator? (see my other comment about the difference of it in variable
expansion in make)
>

Y'know, I thought about doing this but wasn't sure if the end result was
too messy.  I've changed it to do what you are suggesting.  Hopefully it makes
sense.

>- [14/17] `5fcbbc8fe262` ("redhat/Makefile: Fix dist-brew & distg-brew
targets")
>
>  I think you missed a ```-``` here, ```--scratch``` instead of
```-scratch```, in both targets.

Fixed.

>
>- [15/17] `7b1de039af6d` ("redhat/Makefile: Rename BUILDID to LOCALVERSION")
>
>  Should we also change redhat/koji/Makefile and rename BUILDID there too?

I thought about this and decided not to make this change.  The reason is
that the BUILDID in that Makefile really references the 'buildid' variable
set with 'git notes --ref buildid -m ".buildid" HEAD'.  IOW, this isn't
really a LOCALVERSION.
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

[OS-BUILD PATCH] Fix nightly merge CI

2022-05-12 Thread Don Zickus (via Email Bridge)

From: Don Zickus 

Fix nightly merge CI

My recent MR for builddeps broke the nightly merge CI scripts because
the script was using the wrong supported container.  Update the CI
script to use the correct supported CKI container image for ARK.

Signed-off-by: Don Zickus 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -183,7 +183,7 @@ rhel9_realtime_baseline:
 
 # scheduled job
 .scheduled_setup:
-  image: registry.gitlab.com/cki-project/containers/builder-fedora
+  image: registry.gitlab.com/cki-project/containers/builder-rawhide
   variables:
 GIT_DEPTH: "0"
 GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1777
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

Re: [OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

Re: [OS-BUILD PATCH] redhat/docs: Add a description of kernel naming

[OS-BUILD PATCH] redhat/docs: Add a description of kernel naming

[OS-BUILD PATCH] redhat/configs: Fix rm warning on error

Re: [OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

✅ PASS: Test report for kernel 5.17.7-200.fc35 (fedora-35)

Re: [OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

Re: [OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

[OS-BUILD PATCHv2 9/17] redhat/kernel.spec.template: Move genspec variables into one section

[OS-BUILD PATCHv2 16/17] redhat/Makefile: Rename PREBUILD to UPSTREAMBUILD

[OS-BUILD PATCHv2 17/17] self-test/data/create-data.sh: Avoid SINGLE_TARBALL warning

[OS-BUILD PATCHv2 14/17] redhat/Makefile: Fix dist-brew & distg-brew targets

[OS-BUILD PATCHv2 12/17] redhat/scripts/new_release.sh: Use Makefile variables

[OS-BUILD PATCHv2 15/17] redhat/Makefile: Rename BUILDID to LOCALVERSION

[OS-BUILD PATCHv2 13/17] redhat/Makefile: Reorganize MARKER code

[OS-BUILD PATCHv2 11/17] redhat/Makefile: Rename YSTREAM and ZSTREAM

[OS-BUILD PATCHv2 10/17] redhat/genspec.sh: Add comment about SPECBUILDID variable

[OS-BUILD PATCHv2 8/17] redhat/kernel.spec.template: Remove kversion

[OS-BUILD PATCHv2 7/17] redhat/Makefile: Add SPECTARFILE_RELEASE comment

[OS-BUILD PATCHv2 4/17] redhat/Makefile: Move SPECRELEASE to genspec.sh

[OS-BUILD PATCHv2 6/17] redhat/Makefile: Rename RPMVERSION to BASEVERSION

[OS-BUILD PATCHv2 3/17] redhat/Makefile: Add kernel-NVR comment

[OS-BUILD PATCHv2 5/17] redhat/Makefile: Target whitespace cleanup

[OS-BUILD PATCHv2 2/17] redhat/Makefile: Use SPECFILE variable

[OS-BUILD PATCHv2 1/17] redhat/Makefile: Remove KEXTRAVERSION

[OS-BUILD PATCHv2 0/17] redhat/Makefile: General improvements and fixes

Re: [OS-BUILD PATCH 0/17] redhat/Makefile: General improvements and fixes

[OS-BUILD PATCH] Fix nightly merge CI

28 matches

Site Navigation

Mail list logo

Footer information