From: Prarit Bhargava <prarit@xxxxxxxxxx> 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 <prarit@xxxxxxxxxx> 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 # (YYYYMMDDgit). -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 Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c -PREBUILD=0.rc5. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -70,6 +69,7 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5. UPSTREAM_TARBALL_NAME=5.16-rc5 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +93,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c -PREBUILD=0.rc5. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -70,6 +69,7 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5. UPSTREAM_TARBALL_NAME=5.16-rc5 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +93,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 MARKER=78e36f3b0dae586 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 -PREBUILD=0.rc0.78e36f3b0dae586. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -70,6 +69,8 @@ TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc0.78e36f3b0dae586. +UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +94,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 MARKER=78e36f3b0dae586 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 -PREBUILD=0.rc0.78e36f3b0dae586. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -70,6 +69,8 @@ TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc0.78e36f3b0dae586. +UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +94,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 MARKER=v5.16 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 -PREBUILD= PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -70,6 +69,7 @@ TARBALL=../redhat/linux-5.16.0-6.test.tar.xz TARFILE=linux-5.16.0-6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD= UPSTREAM_TARBALL_NAME=5.16 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +93,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 MARKER=v5.16 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 -PREBUILD= PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -70,6 +69,7 @@ TARBALL=../redhat/linux-5.16.0-6.test.tar.xz TARFILE=linux-5.16.0-6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD= UPSTREAM_TARBALL_NAME=5.16 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +93,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 MARKER=fce15c45d3fbd9f MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a -PREBUILD=0.rc5.fce15c45d3fbd9f. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -70,6 +69,8 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f. +UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +94,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 MARKER=fce15c45d3fbd9f MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a -PREBUILD=0.rc5.fce15c45d3fbd9f. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -70,6 +69,8 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f. +UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +94,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c -PREBUILD=0.rc5. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16-rc5.tar.xz TARFILE=linux-5.16-rc5.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5. UPSTREAM_TARBALL_NAME=5.16-rc5 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= 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 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c -PREBUILD=0.rc5. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16-rc5.tar.xz TARFILE=linux-5.16-rc5.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5. UPSTREAM_TARBALL_NAME=5.16-rc5 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7 b/redhat/self-test/data/fedora-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.el7 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 MARKER=78e36f3b0dae586 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 -PREBUILD=0.rc0.78e36f3b0dae586. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,8 @@ TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc0.78e36f3b0dae586. +UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 MARKER=78e36f3b0dae586 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 -PREBUILD=0.rc0.78e36f3b0dae586. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,8 @@ TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc0.78e36f3b0dae586. +UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7 b/redhat/self-test/data/fedora-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.el7 +++ b/redhat/self-test/data/fedora-df0cc57e057f.el7 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 MARKER=v5.16 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 -PREBUILD= PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16.tar.xz TARFILE=linux-5.16.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD= UPSTREAM_TARBALL_NAME=5.16 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25 b/redhat/self-test/data/fedora-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.fc25 +++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 MARKER=v5.16 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 -PREBUILD= PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16.tar.xz TARFILE=linux-5.16.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD= UPSTREAM_TARBALL_NAME=5.16 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7 b/redhat/self-test/data/fedora-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.el7 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 MARKER=fce15c45d3fbd9f MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a -PREBUILD=0.rc5.fce15c45d3fbd9f. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,8 @@ TARBALL=../redhat/linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f. +UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 MARKER=fce15c45d3fbd9f MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a -PREBUILD=0.rc5.fce15c45d3fbd9f. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,8 @@ TARBALL=../redhat/linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f. +UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7 b/redhat/self-test/data/rhel-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.el7 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7 @@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg Mak MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=rhel DIST=.el7 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c -PREBUILD=0.rc5. PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat @@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. +UPSTREAMBUILD=0.rc5. UPSTREAM_TARBALL_NAME=5.16-rc5 VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -PREBUILD_GIT_ONLY=1 +UPSTREAMBUILD_GIT_ONLY= RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure