[OS-BUILD PATCHv6 0/3] Turn off forced debug builds

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2263

For many years, rawhide kernels have forced users to run debug builds on
git snapshots by not building a non debug kernel as an option.  While
this has served us well, in finding occasional bugs that are less likely
to surface otherwise, the performance of debug kernels has gotten
considerably worse over time. After evaluating the debug configs to see
if performance could be improved, it has become clear that we would have
to trade off too much to regain performance. We would be better served
by leaving more debug options enabled and offering a non debug kernel
for all users on all builds.

Signed-off-by: Justin M. Forbes

---
 redhat/scripts/genspec/genspec.sh                   |  10 ----------
 redhat/self-test/data/centos-78e36f3b0dae.el7.spec  |   1 -
 redhat/self-test/data/centos-78e36f3b0dae.fc25.spec |   1 -
 redhat/self-test/data/centos-fce15c45d3fb.el7.spec  |   1 -
 redhat/self-test/data/centos-fce15c45d3fb.fc25.spec |   1 -
 redhat/self-test/data/fedora-78e36f3b0dae.el7.spec  |   1 -
 redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec |   1 -
 redhat/self-test/data/fedora-fce15c45d3fb.el7.spec  |   1 -
 redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec |   1 -
 redhat/self-test/data/rhel-78e36f3b0dae.el7.spec    |   1 -
 redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec   |   1 -
 redhat/self-test/data/rhel-fce15c45d3fb.el7.spec    |   1 -
 redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec   |   1 -
 redhat/kernel.spec.template                         |   6 +++---
 14 files changed, 3 insertions(+), 25 deletions(-)

[OS-BUILD PATCHv6 1/3] Turn on debug builds for aarch64 Fedora

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes

Turn on debug builds for aarch64 Fedora

Fedora only did debug builds for x86 in the past. This was largely due
to slow build times on other arches in koji, coupled with much smaller
userbases.  Let's turn on aarch64 now as those builders are much faster
and the userbase is considerably larger these days.  Replacing i686 here
makes sense as we no longer build for that arch.

Signed-off-by: Justin M. Forbes

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
@@ -388,8 +388,8 @@ Summary: The Linux kernel
 %endif

%if 0%{?fedora}
-# don't do debug builds on anything but i686 and x86_64
-%ifnarch i686 x86_64
+# don't do debug builds on anything but aarch64 and x86_64
+%ifnarch aarch64 x86_64
 %define with_debug 0
 %endif
 %endif

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

[OS-BUILD PATCHv6 2/3] Turn off forced debug builds

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes

Turn off forced debug builds

For many years, rawhide kernels have forced users to run debug builds on
git snapshots by not building a non debug kernel as an option.  While
this has served us well, in finding occasional bugs that are less likely
to surface otherwise, the performance of debug kernels has gotten
considerably worse over time. After evaluating the debug configs to see
if performance could be improved, it has become clear that we would have
to trade off too much to regain performance. We would be better served
by leaving more debug options enabled and offering a non debug kernel
for all users on all builds.

Signed-off-by: Justin M. Forbes

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
@@ -122,7 +122,7 @@ Summary: The Linux 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%%
+%define debugbuildsenabled 1
 %%SPECBUILDID%%
 %define specversion %%SPECVERSION%%
 %define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
diff --git a/redhat/scripts/genspec/genspec.sh b/redhat/scripts/genspec/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/genspec/genspec.sh
+++ b/redhat/scripts/genspec/genspec.sh
@@ -4,15 +4,6 @@
 UPSTREAM=$(git rev-parse -q --verify origin/"${UPSTREAM_BRANCH}" || \
       git rev-parse -q --verify "${UPSTREAM_BRANCH}")

-if [ "$SNAPSHOT" = 0 ]; then
-	# This is based off a tag on Linus's tree (e.g. v5.5 or v5.5-rc5).
-	# Two kernels are built, one with debug configuration and one without.
-	SPECDEBUG_BUILDS_ENABLED=1
-else
-	# All kernels are built with debug configurations.
-	SPECDEBUG_BUILDS_ENABLED=0
-fi
-
 if [ -n "$DISTLOCALVERSION" ]; then
    SPECBUILDID=$(printf "%%define buildid %s" "$DISTLOCALVERSION")
 else
@@ -59,7 +50,6 @@ test -f "$SOURCES/$SPECFILE" &&
    s/%%SPECBUILD%%/$SPECBUILD/
    s/%%SPECRELEASE%%/$SPECRELEASE/
    s/%%SPECRELEASED_KERNEL%%/$SPECRELEASED_KERNEL/
-	s/%%SPECDEBUG_BUILDS_ENABLED%%/$SPECDEBUG_BUILDS_ENABLED/
    s/%%SPECINCLUDE_FEDORA_FILES%%/$SPECINCLUDE_FEDORA_FILES/
    s/%%SPECINCLUDE_RHEL_FILES%%/$SPECINCLUDE_RHEL_FILES/
    s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/

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

[OS-BUILD PATCHv6 3/3] Update self-test data to not expect debugbuildsenabled 0

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes

Update self-test data to not expect debugbuildsenabled 0

As we are no longer automatically passing this based on snapshot vs tag
status, the self test data must be updated to accomodate the new
behavior.

Signed-off-by: Justin M. Forbes

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
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 0
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.17.0
 %define patchversion 5.17
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
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 0
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.17.0
 %define patchversion 5.17
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
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 0
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.16.0
 %define patchversion 5.16
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
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 0
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.16.0
 %define patchversion 5.16
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 1
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.17.0
 %define patchversion 5.17
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 1
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.17.0
 %define patchversion 5.17
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 1
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.16.0
 %define patchversion 5.16
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 1
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.16.0
 %define patchversion 5.16
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 0
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.17.0
 %define patchversion 5.17
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec b/redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 0
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.17.0
 %define patchversion 5.17
diff --git a/redhat/self-test/data/rhel-fce15c45d3fb.el7.spec b/redhat/self-test/data/rhel-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/rhel-fce15c45d3fb.el7.spec
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 0
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.16.0
 %define patchversion 5.16
diff --git a/redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec b/redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec
@@ -2,7 +2,6 @@
 %global include_rhel 1
 %global patchlist_changelog 0
 %global released_kernel 0
-%define debugbuildsenabled 0
 %define buildid .test
 %define specversion 5.16.0
 %define patchversion 5.16

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

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2263#note_1255858...

That was done with v6, I am guessing this can be resolved now?

[Prarit Bhargava (via Email Bridge)]

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

Yep.  Odd it doesn't show that I approved this.