From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
The PACKAGE_NAME variable description implies that 'make PACKAGE_NAME="foo" dist-all-rpms' will create a set of rpms with Name "foo". This, unfortunately, does not work.
The PACKAGE_NAME variable must be first renamed to SPECPACKAGE_NAME to comply with the naming convention for Makefile variables that are passed into the kernel spec file. In addition to that there are several other cases where 'kernel' is hardcoded in the scripts and spec files. And lastly, the Makefile assumes that the kernel spec file is always called "kernel.spec".
Fix these issues, and allow users to set the kernel rpm Name by setting SPECPACKAGE_NAME.
Signed-off-by: Prarit Bhargava prarit@redhat.com
--- redhat/configs/build_configs.sh | 8 +- redhat/configs/generate_all_configs.sh | 11 +- redhat/configs/process_configs.sh | 4 +- redhat/docs/kernel-naming.rst | 4 +- redhat/koji/Makefile | 4 +- redhat/scripts/genspec/genspec.sh | 1 + redhat/scripts/expand_srpm.sh | 2 +- redhat/scripts/rh-dist-git.sh | 14 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 5 +- redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 1 + redhat/self-test/data/centos-2585cf9dfaad.fc25 | 5 +- redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 1 + redhat/self-test/data/centos-78e36f3b0dae.el7 | 5 +- redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 1 + redhat/self-test/data/centos-78e36f3b0dae.fc25 | 5 +- redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 1 + redhat/self-test/data/centos-df0cc57e057f.el7 | 5 +- redhat/self-test/data/centos-df0cc57e057f.el7.spec | 1 + redhat/self-test/data/centos-df0cc57e057f.fc25 | 5 +- redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 1 + redhat/self-test/data/centos-fce15c45d3fb.el7 | 5 +- redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 1 + redhat/self-test/data/centos-fce15c45d3fb.fc25 | 5 +- redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 1 + redhat/self-test/data/fedora-2585cf9dfaad.el7 | 5 +- redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 1 + redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 5 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 1 + redhat/self-test/data/fedora-78e36f3b0dae.el7 | 5 +- redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 1 + redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 5 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 1 + redhat/self-test/data/fedora-df0cc57e057f.el7 | 5 +- redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 1 + redhat/self-test/data/fedora-df0cc57e057f.fc25 | 5 +- redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 1 + redhat/self-test/data/fedora-fce15c45d3fb.el7 | 5 +- redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 1 + redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 5 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 1 + redhat/self-test/data/rhel-2585cf9dfaad.el7 | 5 +- redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 1 + redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 5 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 1 + redhat/self-test/data/rhel-78e36f3b0dae.el7 | 5 +- redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 1 + redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 5 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 1 + redhat/self-test/data/rhel-df0cc57e057f.el7 | 5 +- redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 1 + redhat/self-test/data/rhel-df0cc57e057f.fc25 | 5 +- redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 1 + redhat/self-test/data/rhel-fce15c45d3fb.el7 | 5 +- redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 1 + redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 5 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 1 + redhat/Makefile | 34 ++++++--- redhat/Makefile.variables | 10 +- redhat/kernel.spec.template | 68 ++++++++++---------- 59 files changed, 183 insertions(+), 121 deletions(-)
From: Prarit Bhargava prarit@redhat.com
redhat: Change PACKAGE_NAME to SPECPACKAGE_NAME
PACKAGE_NAME will be exported to the spec file and according to the naming rules must be renamed to SPECPACKAGE_NAME. This change will make future changes easier and more obvious for review.
Signed-off-by: Prarit Bhargava prarit@redhat.com
diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -56,13 +56,13 @@ ARCHCONFIG := $(shell uname -m | sed -e s/x86_64/X86_64/ \ -e s/s390x/S390/ -e s/ppc.*/PPC/ )
# rpm information -SPECFILE:=$(PACKAGE_NAME).spec +SPECFILE:=$(SPECPACKAGE_NAME).spec RPM:=$(REDHAT)/rpm SRPMS:=$(RPM)/SRPMS SOURCES:=$(RPM)/SOURCES TESTPATCH:=$(REDHAT)/linux-kernel-test.patch -SPECCHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR) -CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1) +SPECCHANGELOG:=$(SPECPACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR) +CHANGELOG_PREV:=$(SPECPACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1) ARCH_LIST=aarch64 ppc64le s390x x86_64
ifndef DISTRO @@ -202,19 +202,19 @@ 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)-$(UPSTREAMBUILD)$(BUILD)$(DISTLOCALVERSION)$(DIST) +# $(SPECPACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(UPSTREAMBUILD)$(BUILD)$(DISTLOCALVERSION)$(DIST) # # This can be evaluated as # -# $(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD) $(DIST) -# $(PACKAGE_NAME)-$(SPECVERSION) -$(SPECBUILD) $(DIST) -# $(PACKAGE_NAME)-$(BASEVERSION) $(DIST) +# $(SPECPACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD) $(DIST) +# $(SPECPACKAGE_NAME)-$(SPECVERSION) -$(SPECBUILD) $(DIST) +# $(SPECPACKAGE_NAME)-$(BASEVERSION) $(DIST) # $(RELEASETAG) $(DIST) # SPECBUILD:=$(UPSTREAMBUILD)$(BUILD)$(DISTLOCALVERSION) SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL) BASEVERSION:=$(SPECVERSION)-$(SPECBUILD) -RELEASETAG:=$(PACKAGE_NAME)-$(BASEVERSION) +RELEASETAG:=$(SPECPACKAGE_NAME)-$(BASEVERSION) SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
# @@ -505,7 +505,7 @@ dist-configs-check: dist-configs-prep
dist-configs-prep: dist-clean-configs +cd $(REDHAT)/configs; ./build_configs.sh "partial" "snip" - +cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)" "$(FLAVOR)" + +cd $(REDHAT)/configs; ./build_configs.sh "$(SPECPACKAGE_NAME)" "$(FLAVOR)"
dist-configs-arch: ARCH_MACH = $(MACH) dist-configs-arch: dist-configs @@ -618,7 +618,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check @cp scripts/kernel-tools/kvm_stat.logrotate \ keys/rhel*.x509 \ kabi/check-kabi \ - configs/$(PACKAGE_NAME)-*.config \ + configs/$(SPECPACKAGE_NAME)-*.config \ configs/partial*.config \ scripts/gating/gating.yaml \ scripts/update_scripts.sh \ diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables index blahblah..blahblah 100644 --- a/redhat/Makefile.variables +++ b/redhat/Makefile.variables @@ -81,11 +81,6 @@ KABI_SUPPORTED_ARCHS ?= # This disables the CONFIG error checking in redhat/configs/process_configs.sh. NO_CONFIGCHECKS ?=
-# This can be used to change the filename of the specfile. For example, it can -# be set to "kernel" for kernel.spec or "kernel-rt" for kernel-rt.spec. This -# is useful for other projects with different specfile names. -PACKAGE_NAME ?= kernel - # In case PATCHLIST_URL is not set to "none", Patchlist.changelog is added to # the kernel src.rpm, which will contain shas and commits not upstream. The # value of PATCHLIST_URL in this case should point to the git repository where @@ -134,6 +129,11 @@ RHSELFTESTDATA ?= # the selftests fail to build. SPECSELFTESTS_MUST_BUILD ?= 0
+# This can be used to change the filename of the specfile. For example, it can +# be set to "kernel" for kernel.spec or "kernel-rt" for kernel-rt.spec. This +# is useful for other projects with different specfile names. +SPECPACKAGE_NAME ?= kernel + # The branch used as upstream. This is what the upstream tarball is it # should be tracked in a local branch. This would be "master" for the # Linus master branch or linux-5.x.y for a stable branch. It can also be diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/build_configs.sh +++ b/redhat/configs/build_configs.sh @@ -1,12 +1,12 @@ #!/bin/bash # # This script merges together the hierarchy of CONFIG_* files under generic -# and debug to form the necessary $PACKAGE_NAME<version>-<arch>-<variant>.config +# and debug to form the necessary $SPECPACKAGE_NAME<version>-<arch>-<variant>.config # files for building RHEL kernels, based on the contents of a control file
test -n "$RHTEST" && exit 0
-PACKAGE_NAME="${1:-kernel}" # defines the package name used +SPECPACKAGE_NAME="${1:-kernel}" # defines the package name used if [ -z "$2" ]; then cat flavors > .flavors else @@ -71,7 +71,7 @@ function merge_configs() flavor=$4 count=$5
- name=$OUTPUT_DIR/$PACKAGE_NAME-$archvar-$flavor.config + name=$OUTPUT_DIR/$SPECPACKAGE_NAME-$archvar-$flavor.config echo "Building $name ... " touch config-merging."$count" config-merged."$count"
@@ -133,7 +133,7 @@ function build_flavor() empty=$(echo "$line" | cut -f2 -d"=") for a in $empty do - echo "# EMPTY" > "$OUTPUT_DIR/$PACKAGE_NAME-$a-$flavor".config + echo "# EMPTY" > "$OUTPUT_DIR/$SPECPACKAGE_NAME-$a-$flavor".config
done elif [ "$(echo "$line" | grep -c "^ORDER")" -ne 0 ]; then 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 @@ -193,7 +193,7 @@ function commit_new_configs() # assume we are in $source_tree/configs, need to get to top level pushd "$(switch_to_toplevel)" &>/dev/null
- for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config + for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config do arch=$(head -1 "$cfg" | cut -b 3-) cfgtmp="${cfg}.tmp" @@ -304,7 +304,7 @@ function process_configs() [ -f .mismatches ] && rm -f .mismatches
count=0 - for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config + for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config do if [ "$count" -eq 0 ]; then # do the first one by itself so that tools are built diff --git a/redhat/docs/kernel-naming.rst b/redhat/docs/kernel-naming.rst index blahblah..blahblah 100644 --- a/redhat/docs/kernel-naming.rst +++ b/redhat/docs/kernel-naming.rst @@ -10,7 +10,7 @@ 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 +**SPECPACKAGE_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 @@ -39,6 +39,6 @@ be overriden by defining a string in redhat/localversion.
The kernel name is constructed as
-$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(UPSTREAMBUILD)$(BUILD)$(DISTLOCALVERSION)$(DIST) +$(SPECPACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(UPSTREAMBUILD)$(BUILD)$(DISTLOCALVERSION)$(DIST)
In general, the kernel follows the Fedora Naming Guidelines, `https://fedoraproject.org/wiki/Packaging:Naming?rd=Packaging:NamingGuideline... https://fedoraproject.org/wiki/Packaging:Naming?rd=Packaging:NamingGuidelines`__. 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 @@ -1626,7 +1626,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} +RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion}
cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} diff --git a/redhat/koji/Makefile b/redhat/koji/Makefile index blahblah..blahblah 100644 --- a/redhat/koji/Makefile +++ b/redhat/koji/Makefile @@ -29,8 +29,8 @@ sources: buildid echo $(BUILDID) > ../../localversion $(MAKE) -C ../ dist-sources mv -f ../rpm/SOURCES/* . - rm -f ./$(PACKAGE_NAME).spec - mv ../rpm/SPECS/$(PACKAGE_NAME).spec . + rm -f ./$(SPECPACKAGE_NAME).spec + mv ../rpm/SPECS/$(SPECPACKAGE_NAME).spec .
test: buildid echo $(BUILDID) diff --git a/redhat/scripts/expand_srpm.sh b/redhat/scripts/expand_srpm.sh index blahblah..blahblah 100755 --- a/redhat/scripts/expand_srpm.sh +++ b/redhat/scripts/expand_srpm.sh @@ -3,7 +3,7 @@ # $1: cloned tree cloned="$1";
-cd "$cloned/$PACKAGE_NAME" || die ""$cloned" doesn't seem to have a dist-git clone"; +cd "$cloned/$SPECPACKAGE_NAME" || die ""$cloned" doesn't seem to have a dist-git clone";
# delete everything in the cloned tree to avoid having stale files rm -r -- * 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 @@ -29,11 +29,11 @@ cd "$tmpdir" || die "Unable to create temporary directory"; test -n "$RHDISTGIT_CACHE" && reference="-- --reference $RHDISTGIT_CACHE" echo "Cloning using $RHPKG_BIN" >&2; # shellcheck disable=SC2086 -eval $RHPKG_BIN clone "$PACKAGE_NAME" "$reference" >/dev/null || die "Unable to clone using $RHPKG_BIN"; +eval $RHPKG_BIN clone "$SPECPACKAGE_NAME" "$reference" >/dev/null || die "Unable to clone using $RHPKG_BIN";
echo "Switching the branch" # change in the correct branch -cd "$tmpdir/$PACKAGE_NAME"; +cd "$tmpdir/$SPECPACKAGE_NAME"; $RHPKG_BIN switch-branch "$RHDISTGIT_BRANCH" || die "switching to branch $RHDISTGIT_BRANCH";
echo "Copying updated files" @@ -42,9 +42,9 @@ echo "Copying updated files"
echo "Uploading new tarballs" # upload tarballs -sed -i "/linux-.*.tar.xz/d" "$tmpdir/$PACKAGE_NAME"/{sources,.gitignore}; -sed -i "/kernel-abi-stablelists.*.tar.bz2/d" "$tmpdir/$PACKAGE_NAME"/{sources,.gitignore}; -sed -i "/kernel-kabi-dw-.*.tar.bz2/d" "$tmpdir/$PACKAGE_NAME"/{sources,.gitignore}; +sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; +sed -i "/kernel-abi-stablelists.*.tar.bz2/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; +sed -i "/kernel-kabi-dw-.*.tar.bz2/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL"
# We depend on word splitting here: @@ -54,11 +54,11 @@ upload $upload_list echo "Creating diff for review ($tmpdir/diff) and changelog" # diff the result (redhat/git/dontdiff). note: diff reuturns 1 if # differences were found -diff -X "$REDHAT"/git/dontdiff -upr "$tmpdir/$PACKAGE_NAME" "$REDHAT"/rpm/SOURCES/ > "$tmpdir"/diff; +diff -X "$REDHAT"/git/dontdiff -upr "$tmpdir/$SPECPACKAGE_NAME" "$REDHAT"/rpm/SOURCES/ > "$tmpdir"/diff; # creating the changelog file
# changelog has been created by genspec.sh, including Resolves line, just copy it here -echo -e "${PACKAGE_NAME}-${DISTBASEVERSION}\n" > "$tmpdir"/changelog +echo -e "${SPECPACKAGE_NAME}-${DISTBASEVERSION}\n" > "$tmpdir"/changelog awk '1;/^Resolves: /{exit};' "$REDHAT"/"$SPECCHANGELOG" >> "$tmpdir"/changelog
# all done
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
From: Prarit Bhargava prarit@redhat.com
redhat/Makefile: Copy spec file
Users can set SPECPACKAGE_NAME which results in a build failure:
cp: cannot stat '/home/prarit/git-kernel/kernel-ark/redhat/kernel-rh.spec.template': No such file or directory
If the spec file exists use it, otherwise assume that kernel.spec.template should be used.
Signed-off-by: Prarit Bhargava prarit@redhat.com
diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -61,8 +61,9 @@ RPM:=$(REDHAT)/rpm SRPMS:=$(RPM)/SRPMS SOURCES:=$(RPM)/SOURCES TESTPATCH:=$(REDHAT)/linux-kernel-test.patch -SPECCHANGELOG:=$(SPECPACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR) -CHANGELOG_PREV:=$(SPECPACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1) +CHANGELOG_EXT:=changelog-$(RHEL_MAJOR).$(RHEL_MINOR) +SPECCHANGELOG:=$(SPECPACKAGE_NAME).$(CHANGELOG_EXT) +CHANGELOG_PREV_EXT:=changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1) ARCH_LIST=aarch64 ppc64le s390x x86_64
ifndef DISTRO @@ -577,10 +578,19 @@ dist-get-buildreqs: setup-source fi
_setup-source: dist-git-version-check + @if [ ! -e $(REDHAT)/$(SPECFILE).template ]; then \ + echo "Creating $(REDHAT)/$(SPECFILE).template as a copy of $(REDHAT)/kernel.spec.template"; \ + cp $(REDHAT)/kernel.spec.template $(REDHAT)/$(SPECFILE).template; \ + fi @cp $(REDHAT)/$(SPECFILE).template $(SOURCES)/$(SPECFILE) @if [ ! -e $(REDHAT)/$(SPECCHANGELOG) ]; then \ - echo "Creating $(SPECCHANGELOG) as copy of $(CHANGELOG_PREV)"; \ - cp $(REDHAT)/$(CHANGELOG_PREV) $(REDHAT)/$(SPECCHANGELOG); \ + if [ -e $(SPECPACKAGE_NAME).$(CHANGELOG_PREV_EXT) ]; then \ + echo "Creating $(SPECCHANGELOG) as copy of $(CHANGELOG_PREV_EXT)"; \ + cp $(REDHAT)/$(SPECPACKAGE_NAME).$(CHANGELOG_PREV_EXT) $(REDHAT)/$(SPECCHANGELOG); \ + else \ + echo "Creating $(SPECCHANGELOG) as copy of $(REDHAT)/kernel.$(CHANGELOG_EXT)"; \ + cp $(REDHAT)/kernel.$(CHANGELOG_EXT) $(SPECCHANGELOG); \ + fi; \ fi @if [ -z "$(RHSELFTESTDATA)" ]; then \ cp $(REDHAT)/$(SPECCHANGELOG) $(SOURCES)/$(SPECCHANGELOG); \
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
From: Prarit Bhargava prarit@redhat.com
kernel.spec.template: Use SPECPACKAGE_NAME
The SPECPACKAGE_NAME variable is used to change the kernel RPM name. The variable should be used to override the RPM name field. This also requires changing the name of the kernel config files to use %{name}.
Use SPECPACKAGE_NAME in the spec file.
Signed-off-by: Prarit Bhargava prarit@redhat.com
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 @@ -126,6 +126,8 @@ Summary: The Linux kernel # genspec.sh variables #
+# kernel package name +%global package_name %%SPECPACKAGE_NAME%% # Include Fedora files %global include_fedora %%SPECINCLUDE_FEDORA_FILES%% # Include RHEL files @@ -425,7 +427,7 @@ Summary: The Linux kernel %define with_bpftool 0 %define with_selftests 0 %define with_debug 0 -%define all_arch_configs kernel-%{version}-*.config +%define all_arch_configs %{name}-%{version}-*.config %endif
# sparse blows up on ppc @@ -448,13 +450,13 @@ Summary: The Linux kernel %ifarch i686 %define asmarch x86 %define hdrarch i386 -%define all_arch_configs kernel-%{version}-i?86*.config +%define all_arch_configs %{name}-%{version}-i?86*.config %define kernel_image arch/x86/boot/bzImage %endif
%ifarch x86_64 %define asmarch x86 -%define all_arch_configs kernel-%{version}-x86_64*.config +%define all_arch_configs %{name}-%{version}-x86_64*.config %define kernel_image arch/x86/boot/bzImage %endif
@@ -465,19 +467,19 @@ Summary: The Linux kernel %define kernel_image vmlinux %define kernel_image_elf 1 %define use_vdso 0 -%define all_arch_configs kernel-%{version}-ppc64le*.config +%define all_arch_configs %{name}-%{version}-ppc64le*.config %endif
%ifarch s390x %define asmarch s390 %define hdrarch s390 -%define all_arch_configs kernel-%{version}-s390x.config +%define all_arch_configs %{name}-%{version}-s390x.config %define kernel_image arch/s390/boot/bzImage %define vmlinux_decompressor arch/s390/boot/vmlinux %endif
%ifarch %{arm} -%define all_arch_configs kernel-%{version}-arm*.config +%define all_arch_configs %{name}-%{version}-arm*.config %define skip_nonpae_vdso 1 %define asmarch arm %define hdrarch arm @@ -496,7 +498,7 @@ Summary: The Linux kernel %endif
%ifarch aarch64 -%define all_arch_configs kernel-%{version}-aarch64*.config +%define all_arch_configs %{name}-%{version}-aarch64*.config %define asmarch arm64 %define hdrarch arm64 %define make_target vmlinuz.efi @@ -576,7 +578,7 @@ Summary: The Linux kernel %define initrd_prereq dracut >= 027
-Name: kernel +Name: %{package_name} License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ Version: %{specversion} @@ -804,17 +806,17 @@ Source21: mod-sign.sh %if 0%{?include_rhel} Source23: x509.genkey.rhel
-Source24: kernel-aarch64-rhel.config -Source25: kernel-aarch64-debug-rhel.config +Source24: %{name}-aarch64-rhel.config +Source25: %{name}-aarch64-debug-rhel.config Source26: mod-extra.list.rhel
-Source27: kernel-ppc64le-rhel.config -Source28: kernel-ppc64le-debug-rhel.config -Source29: kernel-s390x-rhel.config -Source30: kernel-s390x-debug-rhel.config -Source31: kernel-s390x-zfcpdump-rhel.config -Source32: kernel-x86_64-rhel.config -Source33: kernel-x86_64-debug-rhel.config +Source27: %{name}-ppc64le-rhel.config +Source28: %{name}-ppc64le-debug-rhel.config +Source29: %{name}-s390x-rhel.config +Source30: %{name}-s390x-debug-rhel.config +Source31: %{name}-s390x-zfcpdump-rhel.config +Source32: %{name}-x86_64-rhel.config +Source33: %{name}-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel Source35: filter-armv7hl.sh.rhel @@ -830,18 +832,18 @@ Source41: x509.genkey.centos Source50: x509.genkey.fedora Source51: mod-extra.list.fedora
-Source52: kernel-aarch64-fedora.config -Source53: kernel-aarch64-debug-fedora.config -Source54: kernel-armv7hl-fedora.config -Source55: kernel-armv7hl-debug-fedora.config -Source56: kernel-armv7hl-lpae-fedora.config -Source57: kernel-armv7hl-lpae-debug-fedora.config -Source60: kernel-ppc64le-fedora.config -Source61: kernel-ppc64le-debug-fedora.config -Source62: kernel-s390x-fedora.config -Source63: kernel-s390x-debug-fedora.config -Source64: kernel-x86_64-fedora.config -Source65: kernel-x86_64-debug-fedora.config +Source52: %{name}-aarch64-fedora.config +Source53: %{name}-aarch64-debug-fedora.config +Source54: %{name}-armv7hl-fedora.config +Source55: %{name}-armv7hl-debug-fedora.config +Source56: %{name}-armv7hl-lpae-fedora.config +Source57: %{name}-armv7hl-lpae-debug-fedora.config +Source60: %{name}-ppc64le-fedora.config +Source61: %{name}-ppc64le-debug-fedora.config +Source62: %{name}-s390x-fedora.config +Source63: %{name}-s390x-debug-fedora.config +Source64: %{name}-x86_64-fedora.config +Source65: %{name}-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora Source68: filter-armv7hl.sh.fedora 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 @@ -56,6 +56,7 @@ test -f "$SOURCES/$SPECFILE" && s/%%SPECVERSION%%/$SPECVERSION/ s/%%SPECKABIVERSION%%/$SPECKABIVERSION/ s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/ + s/%%SPECPACKAGE_NAME%%/$SPECPACKAGE_NAME/ s/%%SPECSELFTESTS_MUST_BUILD%%/$SPECSELFTESTS_MUST_BUILD/" "$SOURCES/$SPECFILE" test -n "$RHSELFTESTDATA" && test -f "$SOURCES/$SPECFILE" && sed -i -e " /%%SPECCHANGELOG%%/r $SOURCES/$SPECCHANGELOG
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
From: Prarit Bhargava prarit@redhat.com
redhat/kernel.spec.template: Pass SPECPACKAGE_NAME to generate_all_configs.sh
Pass the SPECPACKAGE_NAME variable to the generate_all_configs.sh script.
Signed-off-by: Prarit Bhargava prarit@redhat.com
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 @@ -1570,7 +1570,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled}
# Merge in any user-provided local config option changes %ifnarch %nobuildarches
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
From: Prarit Bhargava prarit@redhat.com
redhat/configs/generate_all_configs.sh: Fix config naming
The existing config naming hardcoded the number of hyphens in the config string name, causing SPECPACKAGE_NAME strings with hyphens to fail.
Fix the config naming to allow for hyphens in the package name.
Signed-off-by: Prarit Bhargava prarit@redhat.com
diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/generate_all_configs.sh +++ b/redhat/configs/generate_all_configs.sh @@ -19,18 +19,19 @@ else SECONDARY=fedora fi
-for i in kernel-*-"$FLAVOR".config; do - NEW=kernel-"$SPECVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//) - #echo $NEW +# The +1 is to remove the - at the end of the SPECPACKAGE_NAME string +specpackage_name_len=$((${#SPECPACKAGE_NAME} + 1)) +for i in ${SPECPACKAGE_NAME}*-"$FLAVOR".config; do + NEW=${SPECPACKAGE_NAME}-"$SPECVERSION"-$(echo ${i:$specpackage_name_len} | sed s/-"$FLAVOR"//) mv "$i" "$NEW" done
rm -f kernel-*-"$SECONDARY".config
if [ "$DEBUGBUILDSENABLED" -eq 0 ]; then - for i in kernel-*debug*.config; do + for i in ${SPECPACKAGE_NAME}-*debug*.config; do base=$(echo "$i" | sed -r s/-?debug//g) - NEW=kernel-$(echo "$base" | cut -d - -f2-) + NEW=${SPECPACKAGE_NAME}-$(echo "$base" | cut -d - -f2-) mv "$i" "$NEW" done fi
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
From: Prarit Bhargava prarit@redhat.com
redhat/kernel.spec.template: Fix hardcoded "kernel"
There are a few places where kernel is hardcoded in the spec.
Replace hardcoded "kernel" with the package name, %{name}.
Signed-off-by: Prarit Bhargava prarit@redhat.com
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 @@ -1564,7 +1564,7 @@ mkdir configs cd configs
# Drop some necessary files from the source dir into the buildroot -cp $RPM_SOURCE_DIR/kernel-*.config . +cp $RPM_SOURCE_DIR/%{name}-*.config . cp %{SOURCE80} . # merge.py cp %{SOURCE3000} . @@ -1628,7 +1628,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} +RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=${name} ./process_configs.sh $OPTS ${specversion}
cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -1693,7 +1693,7 @@ InitBuildVars() { Variant=$1
# Pick the right kernel config file - Config=kernel-%{version}-%{_target_cpu}${Variant:+-${Variant}}.config + Config=%{name}-%{version}-%{_target_cpu}${Variant:+-${Variant}}.config DevelDir=/usr/src/kernels/%{KVERREL}${Variant:++${Variant}}
KernelVer=%{version}-%{release}.%{_target_cpu}${Variant:++${Variant}}
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
From: Prarit Bhargava prarit@redhat.com
redhat/self-test: Update self-test data
Update the self-test data to reflect the variable changes for SPECPACKAGE_NAME.
Signed-off-by: Prarit Bhargava prarit@redhat.com
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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL=none PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test.el7 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL=none PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test.fc25 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 MARKER=78e36f3b0dae MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL=none PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test.el7 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 MARKER=78e36f3b0dae MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL=none PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 MARKER=v5.16 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL=none PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.16.0-6.test.el7 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 MARKER=v5.16 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL=none PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.16.0-6.test.fc25 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 MARKER=fce15c45d3fb MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL=none PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test.el7 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 MARKER=fce15c45d3fb MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL=none PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 0 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE= BUILD_TARGET=rawhide BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.16-rc5 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 @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 1 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 @@ -9,7 +9,8 @@ BUILD_FLAGS= BUILD_PROFILE= BUILD_TARGET=rawhide BUMP_RELEASE=yes -CHANGELOG_PREV=kernel.changelog-9.98 +CHANGELOG_EXT=changelog-9.99 +CHANGELOG_PREV_EXT=changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 @@ -43,7 +44,6 @@ MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 MARKER=v5.16-rc5 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c NO_CONFIGCHECKS= -PACKAGE_NAME=kernel PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c @@ -73,6 +73,7 @@ SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 +SPECPACKAGE_NAME=kernel SPECRELEASED_KERNEL=0 SPECSELFTESTS_MUST_BUILD=0 SPECTARFILE_RELEASE=5.16-rc5 diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec +++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec @@ -1,3 +1,4 @@ +%global package_name kernel %global include_fedora 1 %global include_rhel 1 %global patchlist_changelog 1
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253#note_1285487...
rebased to get around CKI merge failure.
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253#note_1285673...
Latest builds:
make -j10 dist-koji https://koji.fedoraproject.org/koji/taskinfo?taskID=97757313
make -j10 SPECPACKAGE_NAME="praritscrazykernelname" dist-koji https://koji.fedoraproject.org/koji/taskinfo?taskID=97756763
kernel@lists.fedoraproject.org