Merge: redhat: remove EARLY ystream bits

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1708

redhat: remove EARLY ystream bits

JIRA: INTERNAL
Upstream Status: RHEL only (ARK commit 31028fbea1a742c36d19053ade720ea44316ccce)

commit 31028fbea1a742c36d19053ade720ea44316ccce
Author: Jan Stancek <jstancek@redhat.com>
Date:   Thu Oct 30 07:47:25 2025 +0100

    redhat: remove EARLY ystream bits

    This was used in downstream RHEL to avoid NVR collisions between stream
    that is about to GA and next one (which overlap for ~6 weeks). While
    back we started using ZSTREAM numbering early and hence this option
    is no longer used. Remove all related bits.

    Signed-off-by: Jan Stancek <jstancek@redhat.com>

Signed-off-by: Jan Stancek <jstancek@redhat.com>

Approved-by: Scott Weaver <scweaver@redhat.com>
Approved-by: Patrick Talbert <ptalbert@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>

Author: CKI KWF Bot

Makefile.rhelver

@@ -49,36 +49,6 @@ RHEL_REBASE_NUM = 1
 #
 ZSTREAM ?= no
 
-#
-# Early y+1 numbering
-# --------------------
-#
-# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y
-# First is RHEL_RELEASE inherited/merged from y as-is, second number
-# is incremented with each build starting from 1. After merge from y,
-# it resets back to 1. This way y+1 nvr reflects status of last merge.
-#
-# Example:
-#
-# rhel8.0                        rhel-8.1
-#   kernel-4.18.0-58.el8   -->     kernel-4.18.0-58.1.el8
-#                                  kernel-4.18.0-58.2.el8
-#   kernel-4.18.0-59.el8           kernel-4.18.0-59.1.el8
-#   kernel-4.18.0-60.el8
-#   kernel-4.18.0-61.el8   -->     kernel-4.18.0-61.1.el8
-#
-#
-# Use this spot to avoid future merge conflicts.
-# Do not trim this comment.
-EARLY_YSTREAM ?= no
-EARLY_YBUILD:=
-EARLY_YRELEASE:=
-ifneq ("$(ZSTREAM)", "yes")
-  ifeq ("$(EARLY_YSTREAM)","yes")
-    RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
-  endif
-endif
-
 #
 # Automotive
 # ----------

redhat/Makefile

@@ -399,11 +399,7 @@ ifeq ("$(ZSTREAM)", "yes")
   BUILDOPTS += +kabidupchk
 else
   ZSTREAM_FLAG = no
-  ifeq ("$(EARLY_YSTREAM)", "yes")
-    YSTREAM_FLAG = early
-  else
-    YSTREAM_FLAG = yes
-  endif
+  YSTREAM_FLAG = yes
 endif
 
 include Makefile.cross

redhat/scripts/new_release.sh

@@ -18,17 +18,6 @@ if [ "$BUMP_RELEASE" == "no" ]; then
 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' "$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/" "$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
 	NEW_RELEASE=$YVER.$((ZMAJ+1)).1;

redhat/self-test/data/centos-2585cf9dfaad.el7

@@ -24,8 +24,6 @@ DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test.el7
 DISTRO=centos
 DISTRO_USERDEF=centos
 DIST_USERDEF=.el7
-EARLY_YBUILD=
-EARLY_YRELEASE=
 ENABLE_WERROR=1
 FLAVOR=
 GIT=git

redhat/self-test/data/centos-2585cf9dfaad.fc25

@@ -24,8 +24,6 @@ DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test.fc25
 DISTRO=centos
 DISTRO_USERDEF=centos
 DIST_USERDEF=.fc25
-EARLY_YBUILD=
-EARLY_YRELEASE=
 ENABLE_WERROR=1
 FLAVOR=
 GIT=git

redhat/self-test/data/centos-78e36f3b0dae.el7

@@ -24,8 +24,6 @@ DISTRELEASETAG=kernel-5.16.0-6.test.el7
 DISTRO=centos
 DISTRO_USERDEF=centos
 DIST_USERDEF=.el7
-EARLY_YBUILD=
-EARLY_YRELEASE=
 ENABLE_WERROR=1
 FLAVOR=
 GIT=git

redhat/self-test/data/centos-78e36f3b0dae.fc25

@@ -24,8 +24,6 @@ DISTRELEASETAG=kernel-5.16.0-6.test.fc25
 DISTRO=centos
 DISTRO_USERDEF=centos
 DIST_USERDEF=.fc25
-EARLY_YBUILD=
-EARLY_YRELEASE=
 ENABLE_WERROR=1
 FLAVOR=
 GIT=git

redhat/self-test/data/centos-df0cc57e057f.el7

@@ -24,8 +24,6 @@ DISTRELEASETAG=kernel-5.16.0-6.test.el7
 DISTRO=centos
 DISTRO_USERDEF=centos
 DIST_USERDEF=.el7
-EARLY_YBUILD=
-EARLY_YRELEASE=
 ENABLE_WERROR=1
 FLAVOR=
 GIT=git

redhat/self-test/data/centos-df0cc57e057f.fc25

@@ -24,8 +24,6 @@ DISTRELEASETAG=kernel-5.16.0-6.test.fc25
 DISTRO=centos
 DISTRO_USERDEF=centos
 DIST_USERDEF=.fc25
-EARLY_YBUILD=
-EARLY_YRELEASE=
 ENABLE_WERROR=1
 FLAVOR=
 GIT=git

redhat/self-test/data/centos-fce15c45d3fb.el7

@@ -24,8 +24,6 @@ DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test.el7
 DISTRO=centos
 DISTRO_USERDEF=centos
 DIST_USERDEF=.el7
-EARLY_YBUILD=
-EARLY_YRELEASE=
 ENABLE_WERROR=1
 FLAVOR=
 GIT=git