[OS-BUILD PATCH] [redhat] Add GIT macro to Makefile and
Makefile.common:
by GitLab Bridge on behalf of bcrocker
From: Ben Crocker <bcrocker(a)redhat.com>
GIT ?= git
and replace literal occurrences of 'git' with $(GIT).
This change enables us to override 'git' with, e.g., some
arbitrary shell script that prints additional information
and/or does additional processing before and/or after (or
even instead of) invoking /usr/bin/git.
Signed-off-by: Ben Crocker <bcrocker(a)redhat.com>
---
redhat/Makefile | 29 +++++++++++++++--------------
redhat/Makefile.common | 16 ++++++++--------
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index 27d2cd94e78f..ee3702434e05 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,3 +1,4 @@
+GIT ?= git
include Makefile.common
include Makefile.rhpkg
@@ -32,8 +33,8 @@ endif
BUILD_TARGET ?= --scratch $(BUILD_SCRATCH_TARGET)
FLAVOR =
-RHGITURL?=$(shell git config rhg.url || git config remote.origin.url)
-RHGITCOMMIT?=$(shell git log -1 --pretty=format:%H)
+RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
+RHGITCOMMIT?=$(shell $(GIT) log -1 --pretty=format:%H)
# this section is needed in order to make O= to work
_OUTPUT := ..
@@ -199,7 +200,7 @@ $(KABIDW_TARBALL):
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version 2.13
@IFS=" ."; \
- set -- $$(git --version); \
+ set -- $$($(GIT) --version); \
IFS=; \
if [ "$$3" -lt 2 -o \( "$$3" -eq 2 -a "$$4" -lt 13 \) ]; then \
echo "ERROR: You need git version 2.13 or newer to run some setup commands"; \
@@ -219,7 +220,7 @@ setup-source: dist-git-version-check dist-clean-sources
sources-rh: $(TARBALL)
@cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/
@touch $(TESTPATCH)
- @git diff --no-renames HEAD > $(TESTPATCH).tmp
+ @$(GIT) diff --no-renames HEAD > $(TESTPATCH).tmp
@# 1) filterdiff will return crap from the patches it just filtered,
@# that's why egrep is needed so if there're changes under redhat/
@# but not everywhere else, it will be empty just like
@@ -265,7 +266,7 @@ sources-rh: $(TARBALL)
dist-sources: setup-source dist-configs-check dist-kabi dist-kabi-dup sources-rh
dist-test-patch:
- @git diff --no-renames HEAD > $(TESTPATCH);
+ @$(GIT) diff --no-renames HEAD > $(TESTPATCH);
@($(FILTERDIFF) $(TESTPATCH) | egrep -v "^index|^diff" >$(TESTPATCH).tmp; true)
@mv $(TESTPATCH).tmp $(TESTPATCH);
@@ -300,34 +301,34 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@# if neither changelog nor marker was updated, skip bumping a release
- git diff-index --quiet HEAD && (echo "Nothing changed, skipping updates"; exit 0) || true
+ $(GIT) diff-index --quiet HEAD && (echo "Nothing changed, skipping updates"; exit 0) || true
$(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) $(__ZSTREAM); \
- git add $(REDHAT)/$(CHANGELOG); \
- git add $(REDHAT)/marker; \
- git commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"; \
+ $(GIT) add $(REDHAT)/$(CHANGELOG); \
+ $(GIT) add $(REDHAT)/marker; \
+ $(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"; \
dist-release: dist-clean-sources
@$(MAKE) dist-release-finish
dist-release-tag:
- @git tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)" $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
+ @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)" $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
git-tree-check:
- @if test -n "$(DIST_PUSH)" && test -z "$(shell git remote get-url gitlab 2>/dev/null)"; then \
+ @if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote get-url gitlab 2>/dev/null)"; then \
echo -e "Please run 'git remote add gitlab <url>' to enable git-push.\n"; \
exit 1; \
fi
- @git diff-index --quiet HEAD || \
+ @$(GIT) diff-index --quiet HEAD || \
{ echo -e "Dirty tree, please clean before merging.\n"; exit 1; }
DIST_BRANCH ?= "os-build"
dist-merge-upstream: git-tree-check
- @if test "$(shell git branch --show-current)" != "$(DIST_BRANCH)"; then \
+ @if test "$(shell $(GIT) branch --show-current)" != "$(DIST_BRANCH)"; then \
echo -e "Please checkout $(DIST_BRANCH) branch before merging.\n"; \
exit 1; \
fi;
@# If TAG is empty, script defaults to master:HEAD
- git checkout $(DIST_BRANCH)
+ $(GIT) checkout $(DIST_BRANCH)
@$(REDHAT)/scripts/ci/ark-update-configs.sh $(TAG)
dist-merge-upstream-push: export DIST_PUSH="1"
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index b335f3c77c7d..80c3b8dfccd4 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -1,4 +1,4 @@
-TOPDIR:=$(shell git rev-parse --show-toplevel)
+TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
REDHAT:=$(TOPDIR)/redhat
include $(TOPDIR)/Makefile.rhelver
@@ -6,11 +6,11 @@ RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
else echo rpm; fi)
MACH := $(shell uname -m)
-RPMKVERSION:=$(shell git show HEAD:Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')
-RPMKPATCHLEVEL:=$(shell git show HEAD:Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')
-RPMKSUBLEVEL:=$(shell git show HEAD:Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}')
-RPMKEXTRAVERSION:=$(shell git show HEAD:Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}')
-GITID:= $(shell git log --max-count=1 --pretty=format:%H)
+RPMKVERSION:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')
+RPMKPATCHLEVEL:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')
+RPMKSUBLEVEL:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}')
+RPMKEXTRAVERSION:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}')
+GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H)
# marker is git tag which we base off of for exporting patches
# Make sure marker uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel
# makefile as opposed to any adjusted version for snapshotting.
@@ -42,8 +42,8 @@ else
endif
ifeq ($(VERSION_ON_UPSTREAM),1)
# master is expected to track mainline.
- MERGE_BASE:=$(shell git merge-base HEAD master)
- _TAG:=$(shell git describe $(MERGE_BASE))
+ MERGE_BASE:=$(shell $(GIT) merge-base HEAD master)
+ _TAG:=$(shell $(GIT) describe $(MERGE_BASE))
# a snapshot off of a tagged git is of the form [tag]-[cnt]-g[hash]
SNAPSHOT:=$(shell echo $(_TAG) | grep -c '\-g')
else
--
GitLab
1 day, 8 hours
[OS-BUILD PATCH] [redhat] New configs in drivers/gpu
by GitLab Bridge on behalf of jeremycline
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_DRM_AMD_DC_DCN3_0:
Choose this option if you want to have
sienna_cichlid support for display engine
Symbol: DRM_AMD_DC_DCN3_0 [=n]
Type : bool
Defined at drivers/gpu/drm/amd/display/Kconfig:20
Prompt: DCN 3.0 family
Depends on: HAS_IOMEM [=y] && DRM [=m] && DRM_AMDGPU [=m] && DRM_AMD_DC [=y] && X86 [=y] && DRM_AMD_DC_DCN [=y]
Location:
-> Device Drivers
-> Graphics support
-> AMD GPU (DRM_AMDGPU [=m])
-> Display Engine Configuration
---
CONFIG_NOUVEAU_DEBUG_PUSH:
Say Y here if you want to enable verbose push buffer debug output
and sanity checks.
Symbol: NOUVEAU_DEBUG_PUSH [=n]
Type : bool
Defined at drivers/gpu/drm/nouveau/Kconfig:79
Prompt: Enable additional push buffer debugging
Depends on: HAS_IOMEM [=y] && DRM_NOUVEAU [=m]
Location:
-> Device Drivers
-> Graphics support
-> Nouveau (NVIDIA) cards (DRM_NOUVEAU [=m])
---
Cc: David Airlie <airlied(a)redhat.com>
Cc: Adam Jackson <ajax(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_DRM_AMD_DC_DCN3_0 | 1 +
.../common/generic/CONFIG_NOUVEAU_DEBUG_PUSH | 1 +
.../generic/CONFIG_DRM_AMD_DC_DCN3_0 | 19 -------------------
.../generic/CONFIG_NOUVEAU_DEBUG_PUSH | 18 ------------------
4 files changed, 2 insertions(+), 37 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_DRM_AMD_DC_DCN3_0
create mode 100644 redhat/configs/common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_DRM_AMD_DC_DCN3_0
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
diff --git a/redhat/configs/common/generic/CONFIG_DRM_AMD_DC_DCN3_0 b/redhat/configs/common/generic/CONFIG_DRM_AMD_DC_DCN3_0
new file mode 100644
index 000000000000..708bd22e809e
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_DRM_AMD_DC_DCN3_0
@@ -0,0 +1 @@
+# CONFIG_DRM_AMD_DC_DCN3_0 is not set
diff --git a/redhat/configs/common/generic/CONFIG_NOUVEAU_DEBUG_PUSH b/redhat/configs/common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
new file mode 100644
index 000000000000..5614c2c49809
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
@@ -0,0 +1 @@
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_DRM_AMD_DC_DCN3_0 b/redhat/configs/pending-common/generic/CONFIG_DRM_AMD_DC_DCN3_0
deleted file mode 100644
index f6a3c764772e..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_DRM_AMD_DC_DCN3_0
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_DRM_AMD_DC_DCN3_0:
-#
-# Choose this option if you want to have
-# sienna_cichlid support for display engine
-#
-# Symbol: DRM_AMD_DC_DCN3_0 [=n]
-# Type : bool
-# Defined at drivers/gpu/drm/amd/display/Kconfig:20
-# Prompt: DCN 3.0 family
-# Depends on: HAS_IOMEM [=y] && DRM [=m] && DRM_AMDGPU [=m] && DRM_AMD_DC [=y] && X86 [=y] && DRM_AMD_DC_DCN [=y]
-# Location:
-# -> Device Drivers
-# -> Graphics support
-# -> AMD GPU (DRM_AMDGPU [=m])
-# -> Display Engine Configuration
-#
-#
-#
-# CONFIG_DRM_AMD_DC_DCN3_0 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_NOUVEAU_DEBUG_PUSH b/redhat/configs/pending-common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
deleted file mode 100644
index c28eaf703375..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_NOUVEAU_DEBUG_PUSH:
-#
-# Say Y here if you want to enable verbose push buffer debug output
-# and sanity checks.
-#
-# Symbol: NOUVEAU_DEBUG_PUSH [=n]
-# Type : bool
-# Defined at drivers/gpu/drm/nouveau/Kconfig:79
-# Prompt: Enable additional push buffer debugging
-# Depends on: HAS_IOMEM [=y] && DRM_NOUVEAU [=m]
-# Location:
-# -> Device Drivers
-# -> Graphics support
-# -> Nouveau (NVIDIA) cards (DRM_NOUVEAU [=m])
-#
-#
-#
-# CONFIG_NOUVEAU_DEBUG_PUSH is not set
--
GitLab
5 days, 9 hours
[OS-BUILD PATCH] [redhat] New configs in drivers/vdpa
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.
---
Cc: "Michael S. Tsirkin" <mst(a)redhat.com>
Cc: Jason Wang <jasowang(a)redhat.com>
Cc: rhvirt-patches(a)redhat.com
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_VDPA_SIM_NET | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_VDPA_SIM_NET
diff --git a/redhat/configs/common/generic/CONFIG_VDPA_SIM_NET b/redhat/configs/common/generic/CONFIG_VDPA_SIM_NET
new file mode 100644
index 000000000000..e69de29bb2d1
--
GitLab
5 days, 10 hours
[OS-BUILD PATCH] [redhat] New configs in drivers/power
by GitLab Bridge on behalf of jeremycline
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_POWER_RESET_VEXPRESS:
Power off and reset support for the ARM Ltd. Versatile
Express boards.
Symbol: POWER_RESET_VEXPRESS [=n]
Type : bool
Defined at drivers/power/reset/Kconfig:184
Prompt: ARM Versatile Express power-off and reset driver
Depends on: POWER_RESET [=y] && (ARM || ARM64 [=y]) && VEXPRESS_CONFIG [=y]=y
Location:
-> Device Drivers
-> Board level reset or power off (POWER_RESET [=y])
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_POWER_RESET_VEXPRESS | 1 +
.../generic/CONFIG_POWER_RESET_VEXPRESS | 17 -----------------
2 files changed, 1 insertion(+), 17 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_POWER_RESET_VEXPRESS
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_POWER_RESET_VEXPRESS
diff --git a/redhat/configs/common/generic/CONFIG_POWER_RESET_VEXPRESS b/redhat/configs/common/generic/CONFIG_POWER_RESET_VEXPRESS
new file mode 100644
index 000000000000..6b285d5c913a
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_POWER_RESET_VEXPRESS
@@ -0,0 +1 @@
+# CONFIG_POWER_RESET_VEXPRESS is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_POWER_RESET_VEXPRESS b/redhat/configs/pending-common/generic/CONFIG_POWER_RESET_VEXPRESS
deleted file mode 100644
index 80e0a957fff8..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_POWER_RESET_VEXPRESS
+++ /dev/null
@@ -1,17 +0,0 @@
-# CONFIG_POWER_RESET_VEXPRESS:
-#
-# Power off and reset support for the ARM Ltd. Versatile
-# Express boards.
-#
-# Symbol: POWER_RESET_VEXPRESS [=n]
-# Type : bool
-# Defined at drivers/power/reset/Kconfig:184
-# Prompt: ARM Versatile Express power-off and reset driver
-# Depends on: POWER_RESET [=y] && (ARM || ARM64 [=y]) && VEXPRESS_CONFIG [=y]=y
-# Location:
-# -> Device Drivers
-# -> Board level reset or power off (POWER_RESET [=y])
-#
-#
-#
-# CONFIG_POWER_RESET_VEXPRESS is not set
--
2.26.2
1 week
[OS-BUILD PATCH] [redhat] New configs in drivers/power
by GitLab Bridge on behalf of jeremycline
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_CHARGER_BQ25980:
Say Y to enable support for the TI BQ25980, BQ25975 and BQ25960
series of fast battery chargers.
Symbol: CHARGER_BQ25980 [=n]
Type : tristate
Defined at drivers/power/supply/Kconfig:639
Prompt: TI BQ25980 battery charger driver
Depends on: POWER_SUPPLY [=y] && I2C [=y] && (GPIOLIB [=y] || COMPILE_TEST [=n])
Location:
-> Device Drivers
-> Power supply class support (POWER_SUPPLY [=y])
Selects: REGMAP_I2C [=m]
---
Cc: Lenny Szubowicz <lszubowi(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_CHARGER_BQ25980 | 1 +
.../generic/CONFIG_CHARGER_BQ25980 | 18 ------------------
2 files changed, 1 insertion(+), 18 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_CHARGER_BQ25980
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CHARGER_BQ25980
diff --git a/redhat/configs/common/generic/CONFIG_CHARGER_BQ25980 b/redhat/configs/common/generic/CONFIG_CHARGER_BQ25980
new file mode 100644
index 000000000000..65e06f37c92d
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CHARGER_BQ25980
@@ -0,0 +1 @@
+# CONFIG_CHARGER_BQ25980 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_CHARGER_BQ25980 b/redhat/configs/pending-common/generic/CONFIG_CHARGER_BQ25980
deleted file mode 100644
index 3c27b8f45b58..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CHARGER_BQ25980
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_CHARGER_BQ25980:
-#
-# Say Y to enable support for the TI BQ25980, BQ25975 and BQ25960
-# series of fast battery chargers.
-#
-# Symbol: CHARGER_BQ25980 [=n]
-# Type : tristate
-# Defined at drivers/power/supply/Kconfig:639
-# Prompt: TI BQ25980 battery charger driver
-# Depends on: POWER_SUPPLY [=y] && I2C [=y] && (GPIOLIB [=y] || COMPILE_TEST [=n])
-# Location:
-# -> Device Drivers
-# -> Power supply class support (POWER_SUPPLY [=y])
-# Selects: REGMAP_I2C [=m]
-#
-#
-#
-# CONFIG_CHARGER_BQ25980 is not set
--
GitLab
1 week
[OS-BUILD PATCH] [redhat] New configs in crypto/Kconfig
by GitLab Bridge on behalf of jeremycline
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_CRYPTO_SM2:
Generic implementation of the SM2 public key algorithm. It was
published by State Encryption Management Bureau, China.
as specified by OSCCA GM/T 0003.1-2012 -- 0003.5-2012.
References:
https://tools.ietf.org/html/draft-shen-sm2-ecdsa-02
http://www.oscca.gov.cn/sca/xxgk/2010-12/17/content_1002386.shtml
http://www.gmbz.org.cn/main/bzlb.html
Symbol: CRYPTO_SM2 [=n]
Type : tristate
Defined at crypto/Kconfig:263
Prompt: SM2 algorithm
Depends on: CRYPTO [=y]
Location:
-> Cryptographic API (CRYPTO [=y])
Selects: CRYPTO_SM3 [=n] && CRYPTO_AKCIPHER [=y] && CRYPTO_MANAGER [=y] && MPILIB [=y] && ASN1 [=y]
---
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE:
Allow obsolete cryptographic algorithms to be selected that have
already been phased out from internal use by the kernel, and are
only useful for userspace clients that still rely on them.
Symbol: CRYPTO_USER_API_ENABLE_OBSOLETE [=y]
Type : bool
Defined at crypto/Kconfig:1915
Prompt: Enable obsolete cryptographic algorithms for userspace
Depends on: CRYPTO [=y] && CRYPTO_USER_API [=y]
Location:
-> Cryptographic API (CRYPTO [=y])
---
CONFIG_CRYPTO_USER_API_RNG_CAVP:
This option enables extra API for CAVP testing via the user-space
interface: resetting of DRBG entropy, and providing Additional Data.
This should only be enabled for CAVP testing. You should say
no unless you know what this is.
Symbol: CRYPTO_USER_API_RNG_CAVP [=n]
Type : bool
Defined at crypto/Kconfig:1895
Prompt: Enable CAVP testing of DRBG
Depends on: CRYPTO [=y] && CRYPTO_USER_API_RNG [=y] && CRYPTO_DRBG [=y]
Location:
-> Cryptographic API (CRYPTO [=y])
-> User-space interface for random number generator algorithms (CRYPTO_USER_API_RNG [=y])
---
Cc: Herbert Xu <herbert.xu(a)redhat.com>
Cc: "David S. Miller" <davem(a)redhat.com>
Cc: Ondrej Mosnacek <omosnace(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../configs/common/generic/CONFIG_CRYPTO_SM2 | 1 +
.../CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE | 1 +
.../generic/CONFIG_CRYPTO_USER_API_RNG_CAVP | 1 +
.../pending-common/generic/CONFIG_CRYPTO_SM2 | 23 -------------------
.../CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE | 17 --------------
.../generic/CONFIG_CRYPTO_USER_API_RNG_CAVP | 19 ---------------
6 files changed, 3 insertions(+), 59 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_CRYPTO_SM2
create mode 100644 redhat/configs/common/generic/CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE
create mode 100644 redhat/configs/common/generic/CONFIG_CRYPTO_USER_API_RNG_CAVP
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CRYPTO_SM2
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CRYPTO_USER_API_RNG_CAVP
diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_SM2 b/redhat/configs/common/generic/CONFIG_CRYPTO_SM2
new file mode 100644
index 000000000000..0d8c1b551abf
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CRYPTO_SM2
@@ -0,0 +1 @@
+# CONFIG_CRYPTO_SM2 is not set
diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE b/redhat/configs/common/generic/CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE
new file mode 100644
index 000000000000..21d316c28741
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_USER_API_RNG_CAVP b/redhat/configs/common/generic/CONFIG_CRYPTO_USER_API_RNG_CAVP
new file mode 100644
index 000000000000..7826178972a9
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CRYPTO_USER_API_RNG_CAVP
@@ -0,0 +1 @@
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_SM2 b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_SM2
deleted file mode 100644
index b577bb249279..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_SM2
+++ /dev/null
@@ -1,23 +0,0 @@
-# CONFIG_CRYPTO_SM2:
-#
-# Generic implementation of the SM2 public key algorithm. It was
-# published by State Encryption Management Bureau, China.
-# as specified by OSCCA GM/T 0003.1-2012 -- 0003.5-2012.
-#
-# References:
-# https://tools.ietf.org/html/draft-shen-sm2-ecdsa-02
-# http://www.oscca.gov.cn/sca/xxgk/2010-12/17/content_1002386.shtml
-# http://www.gmbz.org.cn/main/bzlb.html
-#
-# Symbol: CRYPTO_SM2 [=n]
-# Type : tristate
-# Defined at crypto/Kconfig:263
-# Prompt: SM2 algorithm
-# Depends on: CRYPTO [=y]
-# Location:
-# -> Cryptographic API (CRYPTO [=y])
-# Selects: CRYPTO_SM3 [=n] && CRYPTO_AKCIPHER [=y] && CRYPTO_MANAGER [=y] && MPILIB [=y] && ASN1 [=y]
-#
-#
-#
-# CONFIG_CRYPTO_SM2 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE
deleted file mode 100644
index b8bda73dbf55..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE
+++ /dev/null
@@ -1,17 +0,0 @@
-# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE:
-#
-# Allow obsolete cryptographic algorithms to be selected that have
-# already been phased out from internal use by the kernel, and are
-# only useful for userspace clients that still rely on them.
-#
-# Symbol: CRYPTO_USER_API_ENABLE_OBSOLETE [=y]
-# Type : bool
-# Defined at crypto/Kconfig:1915
-# Prompt: Enable obsolete cryptographic algorithms for userspace
-# Depends on: CRYPTO [=y] && CRYPTO_USER_API [=y]
-# Location:
-# -> Cryptographic API (CRYPTO [=y])
-#
-#
-#
-CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
diff --git a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_USER_API_RNG_CAVP b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_USER_API_RNG_CAVP
deleted file mode 100644
index 7e0c667a45ce..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_USER_API_RNG_CAVP
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_CRYPTO_USER_API_RNG_CAVP:
-#
-# This option enables extra API for CAVP testing via the user-space
-# interface: resetting of DRBG entropy, and providing Additional Data.
-# This should only be enabled for CAVP testing. You should say
-# no unless you know what this is.
-#
-# Symbol: CRYPTO_USER_API_RNG_CAVP [=n]
-# Type : bool
-# Defined at crypto/Kconfig:1895
-# Prompt: Enable CAVP testing of DRBG
-# Depends on: CRYPTO [=y] && CRYPTO_USER_API_RNG [=y] && CRYPTO_DRBG [=y]
-# Location:
-# -> Cryptographic API (CRYPTO [=y])
-# -> User-space interface for random number generator algorithms (CRYPTO_USER_API_RNG [=y])
-#
-#
-#
-# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
--
GitLab
1 week
[OS-BUILD PATCH] [redhat] New configs in drivers/net/can
by GitLab Bridge on behalf of jeremycline
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_CAN_MCP251XFD:
Driver for the Microchip MCP251XFD SPI FD-CAN controller
family.
Symbol: CAN_MCP251XFD [=n]
Type : tristate
Defined at drivers/net/can/spi/mcp251xfd/Kconfig:3
Prompt: Microchip MCP251xFD SPI CAN controllers
Depends on: NET [=y] && CAN [=m] && CAN_DEV [=m] && SPI [=y]
Location:
-> Networking support (NET [=y])
-> CAN bus subsystem support (CAN [=m])
-> CAN Device Drivers
-> Platform CAN drivers with Netlink support (CAN_DEV [=m])
-> CAN SPI interfaces
Selects: REGMAP [=y]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_CAN_MCP251XFD | 1 +
.../generic/CONFIG_CAN_MCP251XFD | 21 -------------------
2 files changed, 1 insertion(+), 21 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_CAN_MCP251XFD
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CAN_MCP251XFD
diff --git a/redhat/configs/common/generic/CONFIG_CAN_MCP251XFD b/redhat/configs/common/generic/CONFIG_CAN_MCP251XFD
new file mode 100644
index 000000000000..ba4b9f992ff9
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CAN_MCP251XFD
@@ -0,0 +1 @@
+# CONFIG_CAN_MCP251XFD is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_CAN_MCP251XFD b/redhat/configs/pending-common/generic/CONFIG_CAN_MCP251XFD
deleted file mode 100644
index a6fef51cc94b..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CAN_MCP251XFD
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_CAN_MCP251XFD:
-#
-# Driver for the Microchip MCP251XFD SPI FD-CAN controller
-# family.
-#
-# Symbol: CAN_MCP251XFD [=n]
-# Type : tristate
-# Defined at drivers/net/can/spi/mcp251xfd/Kconfig:3
-# Prompt: Microchip MCP251xFD SPI CAN controllers
-# Depends on: NET [=y] && CAN [=m] && CAN_DEV [=m] && SPI [=y]
-# Location:
-# -> Networking support (NET [=y])
-# -> CAN bus subsystem support (CAN [=m])
-# -> CAN Device Drivers
-# -> Platform CAN drivers with Netlink support (CAN_DEV [=m])
-# -> CAN SPI interfaces
-# Selects: REGMAP [=y]
-#
-#
-#
-# CONFIG_CAN_MCP251XFD is not set
--
GitLab
1 week
[OS-BUILD PATCH] [redhat] New configs in arch/s390
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_DEBUG_USER_ASCE:
Check on exit to user space that address space control
elements are setup correctly.
If unsure, say N.
Symbol: DEBUG_USER_ASCE [=n]
Type : bool
Defined at arch/s390/Kconfig.debug:9
Prompt: Debug User ASCE
Location:
-> Kernel hacking
-> s390 Debugging
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_DEBUG_USER_ASCE | 1 +
.../generic/CONFIG_DEBUG_USER_ASCE | 18 ------------------
2 files changed, 1 insertion(+), 18 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_DEBUG_USER_ASCE
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_DEBUG_USER_ASCE
diff --git a/redhat/configs/common/generic/CONFIG_DEBUG_USER_ASCE b/redhat/configs/common/generic/CONFIG_DEBUG_USER_ASCE
new file mode 100644
index 000000000000..8a8327065991
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_DEBUG_USER_ASCE
@@ -0,0 +1 @@
+# CONFIG_DEBUG_USER_ASCE is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_DEBUG_USER_ASCE b/redhat/configs/pending-common/generic/CONFIG_DEBUG_USER_ASCE
deleted file mode 100644
index aeaa452caae0..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_DEBUG_USER_ASCE
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_DEBUG_USER_ASCE:
-#
-# Check on exit to user space that address space control
-# elements are setup correctly.
-#
-# If unsure, say N.
-#
-# Symbol: DEBUG_USER_ASCE [=n]
-# Type : bool
-# Defined at arch/s390/Kconfig.debug:9
-# Prompt: Debug User ASCE
-# Location:
-# -> Kernel hacking
-# -> s390 Debugging
-#
-#
-#
-# CONFIG_DEBUG_USER_ASCE is not set
--
GitLab
1 week
[OS-BUILD PATCH] [redhat] New configs in fs/fuse
by GitLab Bridge on behalf of jeremycline
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_FUSE_DAX:
This allows bypassing guest page cache and allows mapping host page
cache directly in guest address space.
If you want to allow mounting a Virtio Filesystem with the "dax"
option, answer Y.
Symbol: FUSE_DAX [=y]
Type : bool
Defined at fs/fuse/Kconfig:42
Prompt: Virtio Filesystem Direct Host Memory Access support
Depends on: VIRTIO_FS [=m] && FS_DAX [=y] && DAX_DRIVER [=y]
Location:
-> File systems
-> FUSE (Filesystem in Userspace) support (FUSE_FS [=m])
-> Virtio Filesystem (VIRTIO_FS [=m])
Selects: INTERVAL_TREE [=y]
---
Cc: Miklos Szeredi <mszeredi(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_FUSE_DAX | 1 +
.../pending-common/generic/CONFIG_FUSE_DAX | 22 -------------------
2 files changed, 1 insertion(+), 22 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_FUSE_DAX
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_FUSE_DAX
diff --git a/redhat/configs/common/generic/CONFIG_FUSE_DAX b/redhat/configs/common/generic/CONFIG_FUSE_DAX
new file mode 100644
index 000000000000..cc453d1c5bc7
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_FUSE_DAX
@@ -0,0 +1 @@
+CONFIG_FUSE_DAX=y
diff --git a/redhat/configs/pending-common/generic/CONFIG_FUSE_DAX b/redhat/configs/pending-common/generic/CONFIG_FUSE_DAX
deleted file mode 100644
index 69992890efd9..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_FUSE_DAX
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_FUSE_DAX:
-#
-# This allows bypassing guest page cache and allows mapping host page
-# cache directly in guest address space.
-#
-# If you want to allow mounting a Virtio Filesystem with the "dax"
-# option, answer Y.
-#
-# Symbol: FUSE_DAX [=y]
-# Type : bool
-# Defined at fs/fuse/Kconfig:42
-# Prompt: Virtio Filesystem Direct Host Memory Access support
-# Depends on: VIRTIO_FS [=m] && FS_DAX [=y] && DAX_DRIVER [=y]
-# Location:
-# -> File systems
-# -> FUSE (Filesystem in Userspace) support (FUSE_FS [=m])
-# -> Virtio Filesystem (VIRTIO_FS [=m])
-# Selects: INTERVAL_TREE [=y]
-#
-#
-#
-CONFIG_FUSE_DAX=y
--
GitLab
1 week
