From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1900
The dist-buildreq-check target is useful in a few ways but results in
unnecessary errors in many cases. Instead of stopping the build, add a
new target 'dist-get-buildreqs' that can be called to get a list of
uninstalled build requirements.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/docs/index.rst | 21 +++++++++++++++++++++
redhat/Makefile | 13 ++++++++-----
.gitlab-ci.yml | 21 +++++++++++++++++++++
3 files changed, 50 insertions(+), 5 deletions(-)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Change fedora BUILD_TARGET
The current fedora BUILD_TARGET is temp-ark-rhel-8-test which is way
out-of-date.
Change the fedora BUILD_TARGET to rawhide. As a result the koji command
executed by the dist-koji target is:
koji build --scratch rawhide /home/prarit/git-kernel/kernel-ark/redhat/rpm/SRPMS/kernel-5.19.0-0.rc4.941e3e791269.34.test.fc36.src.rpm
Suggested-by: Justin Forbes <jforbes(a)fedoraproject.org>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -240,7 +240,7 @@ ifeq ("$(DISTRO)", "fedora")
SINGLE_TARBALL:=0
RHDISTGIT_BRANCH:=rawhide
ifndef BUILD_TARGET
- BUILD_TARGET:=temp-ark-rhel-8-test
+ BUILD_TARGET:=rawhide
endif
# The Fedora tarfile name is based on an upstream tag as users may
# replace the tarball from one with upstream, rebuild, and then deploy
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1898
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Change fedora BUILD_TARGET
The current fedora BUILD_TARGET is temp-ark-rhel-8-test which is way
out-of-date.
Change the fedora BUILD_TARGET to rawhide. As a result the koji command
executed by the dist-koji target is:
koji build --scratch rawhide /home/prarit/git-kernel/kernel-ark/redhat/rpm/SRPMS/kernel-5.19.0-0.rc4.941e3e791269.34.test.fc36.src.rpm
Suggested-by: Justin Forbes <jforbes(a)fedoraproject.org>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -240,7 +240,7 @@ ifeq ("$(DISTRO)", "fedora")
SINGLE_TARBALL:=0
RHDISTGIT_BRANCH:=rawhide
ifndef BUILD_TARGET
- BUILD_TARGET:=temp-ark-rhel-8-test
+ BUILD_TARGET:=rawhide
endif
# The Fedora tarfile name is based on an upstream tag as users may
# replace the tarball from one with upstream, rebuild, and then deploy
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1898
From: pbrobinson on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1911
NOTE: Truncated patchset due to missing public @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.
All these patches are in the various -next branches and are in their various
branches for 5.20 landing, as Fedora 37 will ship with 5.19 this enables us
to support a number of core pieces of the Raspberry Pi 4 series of devices
(4B, 400 and CM4) in F-37.
Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com>
---
Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 +
Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt | 46 -
Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml | 86 +
arch/arm/boot/dts/bcm2711-rpi.dtsi | 4 +
arch/arm/boot/dts/bcm2711.dtsi | 14 +-
arch/arm/boot/dts/bcm2835-common.dtsi | 1 +
arch/arm/configs/bcm2835_defconfig | 1 +
arch/arm/configs/multi_v7_defconfig | 1 +
arch/arm64/configs/defconfig | 1 +
drivers/gpu/drm/v3d/Kconfig | 5 +-
drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +-
drivers/gpu/drm/v3d/v3d_drv.c | 12 +-
drivers/gpu/drm/v3d/v3d_gem.c | 12 +-
drivers/gpu/drm/drm_ioctl.c | 8 +-
drivers/mfd/bcm2835-pm.c | 74 +-
drivers/net/phy/Kconfig | 5 +
drivers/net/phy/Makefile | 1 +
drivers/net/phy/bcm-phy-lib.h | 19 +
drivers/net/phy/bcm-phy-ptp.c | 944 ++++++++++
drivers/net/phy/broadcom.c | 33 +-
drivers/soc/bcm/bcm2835-power.c | 72 +-
include/linux/mfd/bcm2835-pm.h | 1 +
redhat/configs/ark/generic/s390x/CONFIG_BROADCOM_PHY => redhat/configs/common/generic/s390x/CONFIG_BROADCOM_PHY | 0
redhat/configs/fedora/generic/CONFIG_BCM_NET_PHYPTP | 1 +
24 files changed, 1223 insertions(+), 137 deletions(-)
From: Herton R. Krzesinski <herton(a)redhat.com>
redhat: make kernel-zfcpdump-core to not provide kernel-core/kernel
Upstream Status: RHEL only
As reported on bug 2027654*, when doing dnf install kernel on s390x it
might pull kernel-zfcpdump-core which should not be a choice for a
generic kernel. Adjust the kernel_variant_package macro to add an
option allowing adding provides or not and use it for the zfcpdump
variant.
v2: - fix if condition to not hide kernel-<flavour>-core-uname-r which is
required by the kernel-<flavour> meta package.
- wrap kernel provides in kernel_reqprovconf macro as well
- rename the macro option from -p to -o as suggested by Daniel Horak
v3: - fix kernel_reqprovconf expansion as noted by Bruno Goncalves/Jan Stancek
v4: - do not wrap installonlypkg since that should be only a hint to
yum/dnf to allow multiple versions of same packages installed
This same change was applied to centos stream 9, and is being forwarded
ported now to ARK/Fedora, with a fix for the -m option of
kernel_variant_package, it doesn't have an argument so ':' can't
be added after it, for some reason rpm in centos didn't have issues with
it, but on ARK/Fedora we get a failure.
*https://bugzilla.redhat.com/show_bug.cgi?id=2027654
Signed-off-by: Herton R. Krzesinski <herton(a)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
@@ -871,12 +871,14 @@ The kernel meta package
#
# This macro does requires, provides, conflicts, obsoletes for a kernel package.
-# %%kernel_reqprovconf <subpackage>
+# %%kernel_reqprovconf [-o] <subpackage>
# It uses any kernel_<subpackage>_conflicts and kernel_<subpackage>_obsoletes
# macros defined above.
#
-%define kernel_reqprovconf \
+%define kernel_reqprovconf(o) \
+%if %{-o:0}%{!-o:1}\
Provides: kernel = %{specversion}-%{pkg_release}\
+%endif\
Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1270,9 +1272,9 @@ The meta-package for the %{1} kernel\
#
# This macro creates a kernel-<subpackage> and its -devel and -debuginfo too.
# %%define variant_summary The Linux kernel compiled for <configuration>
-# %%kernel_variant_package [-n <pretty-name>] [-m] <subpackage>
+# %%kernel_variant_package [-n <pretty-name>] [-m] [-o] <subpackage>
#
-%define kernel_variant_package(n:m) \
+%define kernel_variant_package(n:mo) \
%package %{?1:%{1}-}core\
Summary: %{variant_summary}\
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1280,7 +1282,7 @@ Provides: installonlypkg(kernel)\
%if %{-m:1}%{!-m:0}\
Requires: kernel-core-uname-r = %{KVERREL}\
%endif\
-%{expand:%%kernel_reqprovconf}\
+%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
%if %{?1:1} %{!?1:0} \
%{expand:%%kernel_meta_package %{?1:%{1}}}\
%endif\
@@ -1330,7 +1332,7 @@ Cortex-A15 devices with LPAE and HW virtualisation support
%if %{with_zfcpdump}
%define variant_summary The Linux kernel compiled for zfcpdump usage
-%kernel_variant_package zfcpdump
+%kernel_variant_package -o zfcpdump
%description zfcpdump-core
The kernel package contains the Linux kernel (vmlinuz) for use by the
zfcpdump infrastructure.
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1908
From: Herton R. Krzesinski <herton(a)redhat.com>
redhat: make kernel-zfcpdump-core to not provide kernel-core/kernel
Upstream Status: RHEL only
As reported on bug 2027654*, when doing dnf install kernel on s390x it
might pull kernel-zfcpdump-core which should not be a choice for a
generic kernel. Adjust the kernel_variant_package macro to add an
option allowing adding provides or not and use it for the zfcpdump
variant.
v2: - fix if condition to not hide kernel-<flavour>-core-uname-r which is
required by the kernel-<flavour> meta package.
- wrap kernel provides in kernel_reqprovconf macro as well
- rename the macro option from -p to -o as suggested by Daniel Horak
v3: - fix kernel_reqprovconf expansion as noted by Bruno Goncalves/Jan Stancek
v4: - do not wrap installonlypkg since that should be only a hint to
yum/dnf to allow multiple versions of same packages installed
This same change was applied to centos stream 9, and is being forwarded
ported now to ARK/Fedora.
*https://bugzilla.redhat.com/show_bug.cgi?id=2027654
Signed-off-by: Herton R. Krzesinski <herton(a)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
@@ -871,12 +871,14 @@ The kernel meta package
#
# This macro does requires, provides, conflicts, obsoletes for a kernel package.
-# %%kernel_reqprovconf <subpackage>
+# %%kernel_reqprovconf [-o] <subpackage>
# It uses any kernel_<subpackage>_conflicts and kernel_<subpackage>_obsoletes
# macros defined above.
#
-%define kernel_reqprovconf \
+%define kernel_reqprovconf(o) \
+%if %{-o:0}%{!-o:1}\
Provides: kernel = %{specversion}-%{pkg_release}\
+%endif\
Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1270,9 +1272,9 @@ The meta-package for the %{1} kernel\
#
# This macro creates a kernel-<subpackage> and its -devel and -debuginfo too.
# %%define variant_summary The Linux kernel compiled for <configuration>
-# %%kernel_variant_package [-n <pretty-name>] [-m] <subpackage>
+# %%kernel_variant_package [-n <pretty-name>] [-m] [-o] <subpackage>
#
-%define kernel_variant_package(n:m) \
+%define kernel_variant_package(n:m:o) \
%package %{?1:%{1}-}core\
Summary: %{variant_summary}\
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1280,7 +1282,7 @@ Provides: installonlypkg(kernel)\
%if %{-m:1}%{!-m:0}\
Requires: kernel-core-uname-r = %{KVERREL}\
%endif\
-%{expand:%%kernel_reqprovconf}\
+%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
%if %{?1:1} %{!?1:0} \
%{expand:%%kernel_meta_package %{?1:%{1}}}\
%endif\
@@ -1330,7 +1332,7 @@ Cortex-A15 devices with LPAE and HW virtualisation support
%if %{with_zfcpdump}
%define variant_summary The Linux kernel compiled for zfcpdump usage
-%kernel_variant_package zfcpdump
+%kernel_variant_package -o zfcpdump
%description zfcpdump-core
The kernel package contains the Linux kernel (vmlinuz) for use by the
zfcpdump infrastructure.
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1908
From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1808
NOTE: Truncated patchset due to missing public @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.
Symbol: TRUSTED_KEYS_TPM [=y]
Type : bool
Defined at security/keys/trusted-keys/Kconfig:1
Prompt: TPM-based trusted keys
Depends on: TRUSTED_KEYS [=y] && TCG_TPM [=y]>=TRUSTED_KEYS [=y]
Location:
Main menu
-> Security options
-> Enable access key retention support (KEYS [=y])
-> TRUSTED KEYS (TRUSTED_KEYS [=y])
Selects: CRYPTO [=y] && CRYPTO_HMAC [=y] && CRYPTO_SHA1 [=y] &&
CRYPTO_HASH_INFO [=y] && ASN1_ENCODER [=y] && OID_REGISTRY [=y] && ASN1 [=y]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_TRUSTED_KEYS_TEE | 1 +
redhat/configs/fedora/generic/CONFIG_TRUSTED_KEYS_TPM => redhat/configs/common/generic/CONFIG_TRUSTED_KEYS_TPM | 0
redhat/configs/fedora/generic/arm/CONFIG_TRUSTED_KEYS_CAAM | 1 +
redhat/configs/pending-ark/generic/CONFIG_TRUSTED_KEYS_TPM | 15 ----------
4 files changed, 2 insertions(+), 15 deletions(-)