March 2021 - kernel - Fedora Mailing-Lists

[OS-BUILD PATCHv3 0/0] [redhat] New configs in lib/Kconfig.debug

by CKI Gitlab (via Email Bridge)

From: CKI Gitlab on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/799 NOTE: Truncated patchset due to missing @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. CONFIG_HARDLOCKUP_DETECTOR: Say Y here to enable the kernel to act as a watchdog to detect hard lockups. Hardlockups are bugs that cause the CPU to loop in kernel mode for more than 10 seconds, without letting other interrupts have a chance to run. The current stack trace is displayed upon detection and the system will stay locked up. Symbol: HARDLOCKUP_DETECTOR [=n] Type : bool Defined at lib/Kconfig.debug:1000 Prompt: Detect Hard Lockups Depends on: DEBUG_KERNEL [=y] && !S390 && (HAVE_HARDLOCKUP_DETECTOR_PERF [=y] || HAVE_HARDLOCKUP_DETECTOR_ARCH [=n]) Location: -> Kernel hacking -> Debug Oops, Lockups and Hangs Selects: LOCKUP_DETECTOR [=y] && HARDLOCKUP_DETECTOR_PERF [=n] && HARDLOCKUP_DETECTOR_ARCH --- Cc: Prarit Bhargava <prarit(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>

3 years, 1 month

1
0
0 / 0

[OS-BUILD PATCHv2 0/0] [redhat] New configs in lib/Kconfig.debug

by CKI Gitlab (via Email Bridge)

From: CKI Gitlab on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/799 NOTE: Truncated patchset due to missing @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. CONFIG_HARDLOCKUP_DETECTOR: Say Y here to enable the kernel to act as a watchdog to detect hard lockups. Hardlockups are bugs that cause the CPU to loop in kernel mode for more than 10 seconds, without letting other interrupts have a chance to run. The current stack trace is displayed upon detection and the system will stay locked up. Symbol: HARDLOCKUP_DETECTOR [=n] Type : bool Defined at lib/Kconfig.debug:1000 Prompt: Detect Hard Lockups Depends on: DEBUG_KERNEL [=y] && !S390 && (HAVE_HARDLOCKUP_DETECTOR_PERF [=y] || HAVE_HARDLOCKUP_DETECTOR_ARCH [=n]) Location: -> Kernel hacking -> Debug Oops, Lockups and Hangs Selects: LOCKUP_DETECTOR [=y] && HARDLOCKUP_DETECTOR_PERF [=n] && HARDLOCKUP_DETECTOR_ARCH --- Cc: Prarit Bhargava <prarit(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>

3 years, 1 month

2
1
0 / 0

[OS-BUILD PATCH] [redhat] New configs in drivers/pinctrl

by CKI Gitlab (via Email Bridge)

From: Fedora Kernel Team <kernel-team(a)fedoraproject.org> [redhat] New configs in drivers/pinctrl Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. CONFIG_PINCTRL_SC8180X: This is the pinctrl, pinmux, pinconf and gpiolib driver for the Qualcomm Technologies Inc TLMM block found on the Qualcomm Technologies Inc SC8180x platform. Symbol: PINCTRL_SC8180X [=n] Type : tristate Defined at drivers/pinctrl/qcom/Kconfig:223 Prompt: Qualcomm Technologies Inc SC8180x pin controller driver Depends on: PINCTRL [=y] && (ARCH_QCOM [=y] || COMPILE_TEST [=n]) && GPIOLIB [=y] && OF [=y] Location: -> Device Drivers -> Pin controllers (PINCTRL [=y]) Selects: PINCTRL_MSM [=n] --- CONFIG_PINCTRL_SM8350: This is the pinctrl, pinmux, pinconf and gpiolib driver for the Qualcomm Technologies Inc TLMM block found on the Qualcomm Technologies Inc SM8350 platform. Symbol: PINCTRL_SM8350 [=n] Type : tristate Defined at drivers/pinctrl/qcom/Kconfig:277 Prompt: Qualcomm Technologies Inc SM8350 pin controller driver Depends on: PINCTRL [=y] && (ARCH_QCOM [=y] || COMPILE_TEST [=n]) && GPIOLIB [=y] && OF [=y] Location: -> Device Drivers -> Pin controllers (PINCTRL [=y]) Selects: PINCTRL_MSM [=n] --- Cc: Brian Masney <bmasney(a)redhat.com> Cc: David Arcari <darcari(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org> diff a/redhat/configs/common/generic/CONFIG_PINCTRL_SC8180X b/redhat/configs/common/generic/CONFIG_PINCTRL_SC8180X --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_PINCTRL_SC8180X @@ -0,0 +1 @@ +# CONFIG_PINCTRL_SC8180X is not set diff a/redhat/configs/common/generic/CONFIG_PINCTRL_SM8350 b/redhat/configs/common/generic/CONFIG_PINCTRL_SM8350 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_PINCTRL_SM8350 @@ -0,0 +1 @@ +# CONFIG_PINCTRL_SM8350 is not set diff a/redhat/configs/pending-common/generic/CONFIG_PINCTRL_SC8180X b/redhat/configs/pending-common/generic/CONFIG_PINCTRL_SC8180X --- a/redhat/configs/pending-common/generic/CONFIG_PINCTRL_SC8180X +++ /dev/null @@ -1,19 +0,0 @@ -# CONFIG_PINCTRL_SC8180X: -# -# This is the pinctrl, pinmux, pinconf and gpiolib driver for the -# Qualcomm Technologies Inc TLMM block found on the Qualcomm -# Technologies Inc SC8180x platform. -# -# Symbol: PINCTRL_SC8180X [=n] -# Type : tristate -# Defined at drivers/pinctrl/qcom/Kconfig:223 -# Prompt: Qualcomm Technologies Inc SC8180x pin controller driver -# Depends on: PINCTRL [=y] && (ARCH_QCOM [=y] || COMPILE_TEST [=n]) && GPIOLIB [=y] && OF [=y] -# Location: -# -> Device Drivers -# -> Pin controllers (PINCTRL [=y]) -# Selects: PINCTRL_MSM [=n] -# -# -# -# CONFIG_PINCTRL_SC8180X is not set diff a/redhat/configs/pending-common/generic/CONFIG_PINCTRL_SM8350 b/redhat/configs/pending-common/generic/CONFIG_PINCTRL_SM8350 --- a/redhat/configs/pending-common/generic/CONFIG_PINCTRL_SM8350 +++ /dev/null @@ -1,19 +0,0 @@ -# CONFIG_PINCTRL_SM8350: -# -# This is the pinctrl, pinmux, pinconf and gpiolib driver for the -# Qualcomm Technologies Inc TLMM block found on the Qualcomm -# Technologies Inc SM8350 platform. -# -# Symbol: PINCTRL_SM8350 [=n] -# Type : tristate -# Defined at drivers/pinctrl/qcom/Kconfig:277 -# Prompt: Qualcomm Technologies Inc SM8350 pin controller driver -# Depends on: PINCTRL [=y] && (ARCH_QCOM [=y] || COMPILE_TEST [=n]) && GPIOLIB [=y] && OF [=y] -# Location: -# -> Device Drivers -# -> Pin controllers (PINCTRL [=y]) -# Selects: PINCTRL_MSM [=n] -# -# -# -# CONFIG_PINCTRL_SM8350 is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/917

3 years, 1 month

2
1
0 / 0

[OS-BUILD PATCHv3] redhat: add initial support for centos stream dist-git sync on Makefiles

by Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: add initial support for centos stream dist-git sync on Makefiles This change introduces some initial centos stream support, mainly what's needed for a dist-git sync. The dist-git sync is initially proposed to be a fork + merge request model, and thus we need some changes for the Makefiles. I also dropped IS_FEDORA variable, and replace it with DISTRO, which can have either "fedora" or "centos" (and could be set later to "rhel" or anything else if needed through the code). While at it, I also fixed the default RHPKG_BIN to rhpkg instead of rhpkg-sha512 in the default RHEL case, the former was a wrapper for the sha512 transition on dist-git at RHEL 8 time and is not needed anymore, it is now deprecated and will be removed from rhpkg. Example of a dist-git sync with new centos dist-git: make DIST=".el9" GL_DISTGIT_USER=<gitlab user> BUILDID="" RHDISTGIT_BRANCH=c9s dist-git v2: use PACKAGE_NAME in Makefile.rhpkg as suggested by Jan Stancek Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff a/redhat/Makefile b/redhat/Makefile --- a/redhat/Makefile +++ b/redhat/Makefile @@ -404,6 +404,12 @@ dist-git: dist-srpm $(KABI_TARBALL) $(KABIDW_TARBALL) ifeq ("$(RHDISTGIT_BRANCH)", "") $(error RHDISTGIT_BRANCH unset) endif + if [ "$(DISTRO)" == "centos" ]; then \ + if [ -z "$(GL_DISTGIT_USER)" ]; then \ + echo "Error: please Please provide your gitlab username with GL_DISTGIT_USER"; \ + exit 1; \ + fi; \ + fi $(REDHAT)/scripts/rh-dist-git.sh "$(RHDISTGIT_BRANCH)" "$(RHDISTGIT_CACHE)" "$(RHDISTGIT_TMP)" "$(RHDISTGIT)" "$(TARBALL)" "$(KABI_TARBALL)" "$(KABIDW_TARBALL)" "$(__ZSTREAM)" "$(PACKAGE_NAME)" "$(RHEL_MAJOR)" "$(RHPKG_BIN)" "$(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm" dist-rtg: dist-release diff a/redhat/Makefile.common b/redhat/Makefile.common --- a/redhat/Makefile.common +++ b/redhat/Makefile.common @@ -29,14 +29,19 @@ else PREBUILD:= endif -DIST ?=.fc33 -IS_FEDORA:=$(shell ! echo $(DIST) | grep -q fc; echo $$?) +DIST ?= .fc33 +ifeq ("$(shell ! echo $(DIST) | grep -q fc; echo $$?)", "1") + DISTRO := fedora +else + DISTRO ?= centos +endif + # If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based # on a branch tracking upstream. This allows for generating rpms # based on untagged releases. ifeq ("$(DIST)", ".elrdy") VERSION_ON_UPSTREAM:=1 -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") VERSION_ON_UPSTREAM:=1 else VERSION_ON_UPSTREAM:=0 @@ -90,7 +95,7 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 # a diff in the spec file ifeq ("$(DIST)", ".elrdy") SINGLE_TARBALL:=0 -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") SINGLE_TARBALL:=0 else SINGLE_TARBALL:=1 @@ -139,16 +144,20 @@ CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINO ifeq ("$(DIST)", ".elrdy") RHPRODUCT:=rhel-ready -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") RHPRODUCT:=rawhide +else ifeq ("$(DISTRO)", "centos") + RHPRODUCT:=c$(RHEL_MAJOR)s else RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0 endif ifeq ("$(DIST)", ".elrdy") BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test +else ifeq ("$(DISTRO)", "centos") + BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate else BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign endif diff a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg --- a/redhat/Makefile.rhpkg +++ b/redhat/Makefile.rhpkg @@ -2,10 +2,12 @@ # # Command to invoke rhpkg -ifeq ("$(IS_FEDORA)", "1") +ifeq ("$(DISTRO)", "fedora") RHPKG_BIN:=fedpkg +else ifeq ("$(DISTRO)", "centos") + RHPKG_BIN:=centpkg else - RHPKG_BIN:=rhpkg-sha512 + RHPKG_BIN:=rhpkg endif # Kerberos username for pkgs.devel.redhat.com RHDISTGIT_USER:="$(shell whoami)" @@ -27,4 +29,13 @@ ifeq ("$(RHDISTGIT_CACHE)", "") endif endif -RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)" +ifneq ("$(DISTRO)", "centos") + RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)" +else + # CentOS uses a fork + merge request based workflow with dist-git to + # handle changes, so you need to provide the gitlab username and we by + # default set the default user's fork path. The dist-git target in + # redhat/Makefile has a check to see if the variable is not set. + GL_FORK_PATH?=$(PACKAGE_NAME).git + RHDISTGIT:=git@gitlab.com:$(GL_DISTGIT_USER)/$(GL_FORK_PATH) +endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/977

3 years, 1 month

2
2
0 / 0

[OS-BUILD PATCHv2] redhat: add initial support for centos stream dist-git sync on Makefiles

by Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: add initial support for centos stream dist-git sync on Makefiles This change introduces some initial centos stream support, mainly what's needed for a dist-git sync. The dist-git sync is initially proposed to be a fork + merge request model, and thus we need some changes for the Makefiles. I also dropped IS_FEDORA variable, and replace it with DISTRO, which can have either "fedora" or "centos" (and could be set later to "rhel" or anything else if needed through the code). While at it, I also fixed the default RHPKG_BIN to rhpkg instead of rhpkg-sha512 in the default RHEL case, the former was a wrapper for the sha512 transition on dist-git at RHEL 8 time and is not needed anymore, it is now deprecated and will be removed from rhpkg. Example of a dist-git sync with new centos dist-git: make DIST=".el9" GL_DISTGIT_USER=<gitlab user> BUILDID="" RHDISTGIT_BRANCH=c9s dist-git Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff a/redhat/Makefile b/redhat/Makefile --- a/redhat/Makefile +++ b/redhat/Makefile @@ -404,6 +404,12 @@ dist-git: dist-srpm $(KABI_TARBALL) $(KABIDW_TARBALL) ifeq ("$(RHDISTGIT_BRANCH)", "") $(error RHDISTGIT_BRANCH unset) endif + if [ "$(DISTRO)" == "centos" ]; then \ + if [ -z "$(GL_DISTGIT_USER)" ]; then \ + echo "Error: please Please provide your gitlab username with GL_DISTGIT_USER"; \ + exit 1; \ + fi; \ + fi $(REDHAT)/scripts/rh-dist-git.sh "$(RHDISTGIT_BRANCH)" "$(RHDISTGIT_CACHE)" "$(RHDISTGIT_TMP)" "$(RHDISTGIT)" "$(TARBALL)" "$(KABI_TARBALL)" "$(KABIDW_TARBALL)" "$(__ZSTREAM)" "$(PACKAGE_NAME)" "$(RHEL_MAJOR)" "$(RHPKG_BIN)" "$(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm" dist-rtg: dist-release diff a/redhat/Makefile.common b/redhat/Makefile.common --- a/redhat/Makefile.common +++ b/redhat/Makefile.common @@ -29,14 +29,19 @@ else PREBUILD:= endif -DIST ?=.fc33 -IS_FEDORA:=$(shell ! echo $(DIST) | grep -q fc; echo $$?) +DIST ?= .fc33 +ifeq ("$(shell ! echo $(DIST) | grep -q fc; echo $$?)", "1") + DISTRO := fedora +else + DISTRO ?= centos +endif + # If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based # on a branch tracking upstream. This allows for generating rpms # based on untagged releases. ifeq ("$(DIST)", ".elrdy") VERSION_ON_UPSTREAM:=1 -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") VERSION_ON_UPSTREAM:=1 else VERSION_ON_UPSTREAM:=0 @@ -90,7 +95,7 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 # a diff in the spec file ifeq ("$(DIST)", ".elrdy") SINGLE_TARBALL:=0 -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") SINGLE_TARBALL:=0 else SINGLE_TARBALL:=1 @@ -139,16 +144,20 @@ CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINO ifeq ("$(DIST)", ".elrdy") RHPRODUCT:=rhel-ready -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") RHPRODUCT:=rawhide +else ifeq ("$(DISTRO)", "centos") + RHPRODUCT:=c$(RHEL_MAJOR)s else RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0 endif ifeq ("$(DIST)", ".elrdy") BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test +else ifeq ("$(DISTRO)", "centos") + BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate else BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign endif diff a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg --- a/redhat/Makefile.rhpkg +++ b/redhat/Makefile.rhpkg @@ -2,10 +2,12 @@ # # Command to invoke rhpkg -ifeq ("$(IS_FEDORA)", "1") +ifeq ("$(DISTRO)", "fedora") RHPKG_BIN:=fedpkg +else ifeq ("$(DISTRO)", "centos") + RHPKG_BIN:=centpkg else - RHPKG_BIN:=rhpkg-sha512 + RHPKG_BIN:=rhpkg endif # Kerberos username for pkgs.devel.redhat.com RHDISTGIT_USER:="$(shell whoami)" @@ -27,4 +29,13 @@ ifeq ("$(RHDISTGIT_CACHE)", "") endif endif -RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)" +ifneq ("$(DISTRO)", "centos") + RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)" +else + # CentOS uses a fork + merge request based workflow with dist-git to + # handle changes, so you need to provide the gitlab username and we by + # default set the default user's fork path. The dist-git target in + # redhat/Makefile has a check to see if the variable is not set. + GL_FORK_PATH?=kernel.git + RHDISTGIT:=git@gitlab.com:$(GL_DISTGIT_USER)/$(GL_FORK_PATH) +endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/977

3 years, 1 month

3
8
0 / 0

[OS-BUILD PATCH] redhat: add initial support for centos stream dist-git sync on Makefiles

by Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: add initial support for centos stream dist-git sync on Makefiles This change introduces some intial centos stream support, mainly what's needed for a dist-git sync. The dist-git sync is initially proposed to be a fork + merge request model, and thus we need some changes for the Makefiles. I also dropped IS_FEDORA variable, and replace it with DISTRO, which can have either "fedora" or "centos" (and could be set later to "rhel" or anything else if needed through the code). While at it, I also fixed the default RHPKG_BIN to rhpkg instead of rhpkg-sha512 in the default RHEL case, the former was a wrapper for the sha512 transition on dist-git at RHEL 8 time and is not needed anymore, it is now deprecated and will be removed from rhpkg. Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff a/redhat/Makefile b/redhat/Makefile --- a/redhat/Makefile +++ b/redhat/Makefile @@ -404,6 +404,12 @@ dist-git: dist-srpm $(KABI_TARBALL) $(KABIDW_TARBALL) ifeq ("$(RHDISTGIT_BRANCH)", "") $(error RHDISTGIT_BRANCH unset) endif + if [ "$(DISTRO)" == "centos" ]; then \ + if [ -z "$(GL_DISTGIT_USER)" ]; then \ + echo "Error: please Please provide your gitlab username with GL_DISTGIT_USER"; \ + exit 1; \ + fi; \ + fi $(REDHAT)/scripts/rh-dist-git.sh "$(RHDISTGIT_BRANCH)" "$(RHDISTGIT_CACHE)" "$(RHDISTGIT_TMP)" "$(RHDISTGIT)" "$(TARBALL)" "$(KABI_TARBALL)" "$(KABIDW_TARBALL)" "$(__ZSTREAM)" "$(PACKAGE_NAME)" "$(RHEL_MAJOR)" "$(RHPKG_BIN)" "$(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm" dist-rtg: dist-release diff a/redhat/Makefile.common b/redhat/Makefile.common --- a/redhat/Makefile.common +++ b/redhat/Makefile.common @@ -29,14 +29,19 @@ else PREBUILD:= endif -DIST ?=.fc33 -IS_FEDORA:=$(shell ! echo $(DIST) | grep -q fc; echo $$?) +DIST ?= .fc33 +ifeq ("$(shell ! echo $(DIST) | grep -q fc; echo $$?)", "1") + DISTRO := fedora +else + DISTRO ?= centos +endif + # If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based # on a branch tracking upstream. This allows for generating rpms # based on untagged releases. ifeq ("$(DIST)", ".elrdy") VERSION_ON_UPSTREAM:=1 -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") VERSION_ON_UPSTREAM:=1 else VERSION_ON_UPSTREAM:=0 @@ -90,7 +95,7 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 # a diff in the spec file ifeq ("$(DIST)", ".elrdy") SINGLE_TARBALL:=0 -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") SINGLE_TARBALL:=0 else SINGLE_TARBALL:=1 @@ -139,16 +144,20 @@ CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINO ifeq ("$(DIST)", ".elrdy") RHPRODUCT:=rhel-ready -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") RHPRODUCT:=rawhide +else ifeq ("$(DISTRO)", "centos") + RHPRODUCT:=c$(RHEL_MAJOR)s else RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0 endif ifeq ("$(DIST)", ".elrdy") BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test -else ifeq ("$(IS_FEDORA)", "1") +else ifeq ("$(DISTRO)", "fedora") BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test +else ifeq ("$(DISTRO)", "centos") + BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate else BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign endif diff a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg --- a/redhat/Makefile.rhpkg +++ b/redhat/Makefile.rhpkg @@ -2,10 +2,12 @@ # # Command to invoke rhpkg -ifeq ("$(IS_FEDORA)", "1") +ifeq ("$(DISTRO)", "fedora") RHPKG_BIN:=fedpkg +else ifeq ("$(DISTRO)", "centos") + RHPKG_BIN:=centpkg else - RHPKG_BIN:=rhpkg-sha512 + RHPKG_BIN:=rhpkg endif # Kerberos username for pkgs.devel.redhat.com RHDISTGIT_USER:="$(shell whoami)" @@ -27,4 +29,13 @@ ifeq ("$(RHDISTGIT_CACHE)", "") endif endif -RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)" +ifneq ("$(DISTRO)", "centos") + RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)" +else + # CentOS uses a fork + merge request based workflow with dist-git to + # handle changes, so you need to provide the gitlab username and we by + # default set the default user's fork path. The dist-git target in + # redhat/Makefile has a check to see if the variable is not set. + GL_FORK_PATH?=kernel.git + RHDISTGIT:=git@gitlab.com:$(GL_DISTGIT_USER)/$(GL_FORK_PATH) +endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/977

3 years, 1 month

1
0
0 / 0

[OS-BUILD PATCH] [redhat] New configs in lib/Kconfig.debug

by GitLab Bridge on behalf of redhat-patchlab

From: Fedora Kernel Team <kernel-team(a)fedoraproject.org> Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. CONFIG_HARDLOCKUP_DETECTOR: Say Y here to enable the kernel to act as a watchdog to detect hard lockups. Hardlockups are bugs that cause the CPU to loop in kernel mode for more than 10 seconds, without letting other interrupts have a chance to run. The current stack trace is displayed upon detection and the system will stay locked up. Symbol: HARDLOCKUP_DETECTOR [=n] Type : bool Defined at lib/Kconfig.debug:1000 Prompt: Detect Hard Lockups Depends on: DEBUG_KERNEL [=y] && !S390 && (HAVE_HARDLOCKUP_DETECTOR_PERF [=y] || HAVE_HARDLOCKUP_DETECTOR_ARCH [=n]) Location: -> Kernel hacking -> Debug Oops, Lockups and Hangs Selects: LOCKUP_DETECTOR [=y] && HARDLOCKUP_DETECTOR_PERF [=n] && HARDLOCKUP_DETECTOR_ARCH --- Cc: Prarit Bhargava <prarit(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org> --- .../common/generic/CONFIG_HARDLOCKUP_DETECTOR | 1 + .../generic/CONFIG_HARDLOCKUP_DETECTOR | 23 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) create mode 100644 redhat/configs/common/generic/CONFIG_HARDLOCKUP_DETECTOR delete mode 100644 redhat/configs/pending-common/generic/CONFIG_HARDLOCKUP_DETECTOR diff --git a/redhat/configs/common/generic/CONFIG_HARDLOCKUP_DETECTOR b/redhat/configs/common/generic/CONFIG_HARDLOCKUP_DETECTOR new file mode 100644 index 000000000000..32d4a56dd961 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_HARDLOCKUP_DETECTOR @@ -0,0 +1 @@ +# CONFIG_HARDLOCKUP_DETECTOR is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_HARDLOCKUP_DETECTOR b/redhat/configs/pending-common/generic/CONFIG_HARDLOCKUP_DETECTOR deleted file mode 100644 index cd74a33e67ea..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_HARDLOCKUP_DETECTOR +++ /dev/null @@ -1,23 +0,0 @@ -# CONFIG_HARDLOCKUP_DETECTOR: -# -# Say Y here to enable the kernel to act as a watchdog to detect -# hard lockups. -# -# Hardlockups are bugs that cause the CPU to loop in kernel mode -# for more than 10 seconds, without letting other interrupts have a -# chance to run. The current stack trace is displayed upon detection -# and the system will stay locked up. -# -# Symbol: HARDLOCKUP_DETECTOR [=n] -# Type : bool -# Defined at lib/Kconfig.debug:1000 -# Prompt: Detect Hard Lockups -# Depends on: DEBUG_KERNEL [=y] && !S390 && (HAVE_HARDLOCKUP_DETECTOR_PERF [=y] || HAVE_HARDLOCKUP_DETECTOR_ARCH [=n]) -# Location: -# -> Kernel hacking -# -> Debug Oops, Lockups and Hangs -# Selects: LOCKUP_DETECTOR [=y] && HARDLOCKUP_DETECTOR_PERF [=n] && HARDLOCKUP_DETECTOR_ARCH -# -# -# -# CONFIG_HARDLOCKUP_DETECTOR is not set -- GitLab

3 years, 1 month

3
2
0 / 0

❌ FAIL: Test report for kernel 5.11.7-200.fc33 (fedora-33)

by CKI Project

Hello, We ran automated tests on the following kernel build: Kernel package: kernel-5.11.7-200.fc33 Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=63992803 The results of these automated tests are provided below. Overall result: FAILED (see details below) Tests: FAILED One or more kernel tests failed: s390x: ❌ LTP All kernel binaries, config files, and logs are available for download here: https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?pre... 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: ✅ Boot test ✅ Storage: swraid mdadm raid_module test 🚧 ✅ xfstests - ext4 🚧 ✅ xfstests - xfs 🚧 ✅ xfstests - btrfs 🚧 ✅ Storage blktests 🚧 ✅ Storage block - filesystem fio test 🚧 ✅ Storage block - queue scheduler test 🚧 ✅ Storage nvme - tcp 🚧 ✅ Storage: lvm device-mapper test 🚧 ✅ stress: stress-ng Host 2: ✅ Boot test ✅ ACPI table test ✅ LTP ✅ CIFS Connectathon ✅ Loopdev Sanity ✅ Memory: fork_mem ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Ethernet drivers sanity ppc64le: Host 1: ✅ Boot test ✅ LTP ✅ CIFS Connectathon ✅ Loopdev Sanity ✅ Memory: fork_mem ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Ethernet drivers sanity Host 2: ✅ Boot test ✅ Storage: swraid mdadm raid_module test 🚧 ✅ xfstests - ext4 🚧 ✅ xfstests - xfs 🚧 ✅ xfstests - btrfs 🚧 ✅ Storage blktests 🚧 ✅ Storage block - filesystem fio test 🚧 ✅ Storage block - queue scheduler test 🚧 ✅ Storage nvme - tcp 🚧 ✅ Storage: lvm device-mapper test s390x: Host 1: ✅ Boot test ❌ LTP ✅ CIFS Connectathon ✅ Loopdev Sanity ✅ Memory: fork_mem ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Ethernet drivers sanity Host 2: ✅ Boot test ✅ Storage: swraid mdadm raid_module test 🚧 ✅ Storage blktests 🚧 ✅ Storage nvme - tcp 🚧 ✅ stress: stress-ng x86_64: Host 1: ✅ Boot test ✅ ACPI table test ✅ LTP ✅ CIFS Connectathon ✅ Loopdev Sanity ✅ Memory: fork_mem ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Ethernet drivers sanity Host 2: ✅ Boot test ✅ Storage: swraid mdadm raid_module test 🚧 ✅ xfstests - ext4 🚧 ✅ xfstests - xfs 🚧 ✅ xfstests - btrfs 🚧 ✅ xfstests - nfsv4.2 🚧 ✅ xfstests - cifsv3.11 🚧 ✅ Storage blktests 🚧 ✅ Storage block - filesystem fio test 🚧 ✅ Storage block - queue scheduler test 🚧 ✅ Storage nvme - tcp 🚧 ✅ Storage: lvm device-mapper test 🚧 ✅ stress: stress-ng Test sources: https://gitlab.com/cki-project/kernel-tests 💚 Pull requests are welcome for new tests or improvements to existing tests! Aborted tests ------------- Tests that didn't complete running successfully are marked with ⚡⚡⚡. If this was caused by an infrastructure issue, we try to mark that explicitly in the report. Waived tests ------------ If the test run included waived tests, they are marked with 🚧. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed. Testing timeout --------------- We aim to provide a report within reasonable timeframe. Tests that haven't finished running yet are marked with ⏱.

3 years, 1 month

1
0
0 / 0

[OS-BUILD PATCHv3] Export ark infrastructure files

by Don Zickus (via Email Bridge)

From: Don Zickus <dzickus(a)redhat.com> Export ark infrastructure files Allow developers to use the ark infrastructure work on upstream git trees. This change saves the redhat/ plus supporting files on top of the 'master' branch. A developer can then 'git merge ark-infra' to apply this infrastructure. "NO_CONFIGCHECKS make dist-configs" to create the configs. And away they go. Utilize the daily rawhide_release builds to create this branch. It fits with the theme and is quick and easy to do in this job. Note I use the 'ark-latest' as the source of the export. This should include any environment fixes for the developer. Tested by copy-n-pasting manual each step in the script to generate the original ark-infra branch. The gitlab-ci.yml change should be intuitive enough to skip testing. V2: Use git-archive and better sed regexp V3: remove git reset and sed diff a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,6 +100,7 @@ rawhide_release: script: - git checkout --track origin/master && git describe - git checkout --track origin/ark-latest && git describe + - git checkout --track origin/ark-infra && git describe - git checkout --track origin/os-build && git describe - export PROJECT_ID="$CI_PROJECT_ID" - redhat/scripts/ci/ark-create-release.sh "master" "$CI_PROJECT_ID" || exit_code=$? @@ -117,6 +118,7 @@ rawhide_release: - git push gitlab "$(git describe)" - git push gitlab ark/* - git push -f gitlab ark-latest + - git push -f gitlab ark-infra retry: 2 rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $RAWHIDE_RELEASE == "true"' diff a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh --- a/redhat/scripts/ci/ark-create-release.sh +++ b/redhat/scripts/ci/ark-create-release.sh @@ -57,6 +57,21 @@ RELEASE=$(git describe) git checkout ark-latest git reset --hard "$RELEASE" +# Update ark-infra branch +git checkout ark-infra + +# Using ark-latest because it has latest fixes +rm -rf makefile Makefile.rhelver redhat/ +git archive --format=tar ark-latest makefile Makefile.rhelver redhat/ | tar -x + +# Manually add hook instead of cherry-pick +# Add to middle to avoid git merge conflicts +# NOTE: commented out but left for future info to rebuild from scratch +# sed -i '/# We are using a recursive / i include Makefile.rhelver\n' Makefile + +git add makefile Makefile.rhelver Makefile redhat +git commit -m "bulk merge ark-infra as of $(date)" + printf "All done! To push all the release artifacts, run: -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/968

3 years, 1 month

3
4
0 / 0

[OS-BUILD PATCH] [redhat] New configs in drivers/md

by GitLab Bridge on behalf of redhat-patchlab

From: Fedora Kernel Team <kernel-team(a)fedoraproject.org> Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. CONFIG_DM_MULTIPATH_IOA: This path selector selects the path based on the CPU the IO is executed on and the CPU to path mapping setup at path addition time. If unsure, say N. Symbol: DM_MULTIPATH_IOA [=n] Type : tristate Defined at drivers/md/Kconfig:466 Prompt: I/O Path Selector based on CPU submission Depends on: MD [=y] && DM_MULTIPATH [=m] Location: -> Device Drivers -> Multiple devices driver support (RAID and LVM) (MD [=y]) -> Device mapper support (BLK_DEV_DM [=m]) -> Multipath target (DM_MULTIPATH [=m]) --- Cc: Nigel Croxon <ncroxon(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org> --- .../common/generic/CONFIG_DM_MULTIPATH_IOA | 1 + .../generic/CONFIG_DM_MULTIPATH_IOA | 21 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) create mode 100644 redhat/configs/common/generic/CONFIG_DM_MULTIPATH_IOA delete mode 100644 redhat/configs/pending-common/generic/CONFIG_DM_MULTIPATH_IOA diff --git a/redhat/configs/common/generic/CONFIG_DM_MULTIPATH_IOA b/redhat/configs/common/generic/CONFIG_DM_MULTIPATH_IOA new file mode 100644 index 000000000000..9dbcf92fa81e --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_DM_MULTIPATH_IOA @@ -0,0 +1 @@ +# CONFIG_DM_MULTIPATH_IOA is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_DM_MULTIPATH_IOA b/redhat/configs/pending-common/generic/CONFIG_DM_MULTIPATH_IOA deleted file mode 100644 index 83a1a727f1bd..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_DM_MULTIPATH_IOA +++ /dev/null @@ -1,21 +0,0 @@ -# CONFIG_DM_MULTIPATH_IOA: -# -# This path selector selects the path based on the CPU the IO is -# executed on and the CPU to path mapping setup at path addition time. -# -# If unsure, say N. -# -# Symbol: DM_MULTIPATH_IOA [=n] -# Type : tristate -# Defined at drivers/md/Kconfig:466 -# Prompt: I/O Path Selector based on CPU submission -# Depends on: MD [=y] && DM_MULTIPATH [=m] -# Location: -# -> Device Drivers -# -> Multiple devices driver support (RAID and LVM) (MD [=y]) -# -> Device mapper support (BLK_DEV_DM [=m]) -# -> Multipath target (DM_MULTIPATH [=m]) -# -# -# -# CONFIG_DM_MULTIPATH_IOA is not set -- GitLab

3 years, 1 month

3
3
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel March 2021