[OS-BUILD PATCH 0/3] Intel Pinctrl Updates
by David Arcari (via Email Bridge)
From: David Arcari on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2946
The first patch in the series performs cleanup of the intel pinctrl
config files resulting in a consistent view. The next two patches
perform RHEL enablement.
Signed-off-by: David Arcari <darcari(a)redhat.com>
---
redhat/configs/common/generic/CONFIG_PINCTRL_ALDERLAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_ALDERLAKE | 0
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_BROXTON => redhat/configs/common/generic/x86/CONFIG_PINCTRL_BROXTON | 0
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_CANNONLAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_CANNONLAKE | 0
redhat/configs/fedora/generic/CONFIG_PINCTRL_CEDARFORK => redhat/configs/common/generic/x86/CONFIG_PINCTRL_CEDARFORK | 0
redhat/configs/common/generic/CONFIG_PINCTRL_ELKHARTLAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_ELKHARTLAKE | 0
redhat/configs/common/generic/CONFIG_PINCTRL_EMMITSBURG => redhat/configs/common/generic/x86/CONFIG_PINCTRL_EMMITSBURG | 0
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_ICELAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_ICELAKE | 0
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_INTEL_PLATFORM => redhat/configs/common/generic/x86/CONFIG_PINCTRL_INTEL_PLATFORM | 0
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_JASPERLAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_JASPERLAKE | 0
redhat/configs/common/generic/CONFIG_PINCTRL_LAKEFIELD => redhat/configs/common/generic/x86/CONFIG_PINCTRL_LAKEFIELD | 0
redhat/configs/common/generic/CONFIG_PINCTRL_LYNXPOINT => redhat/configs/common/generic/x86/CONFIG_PINCTRL_LYNXPOINT | 0
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_METEORPOINT => redhat/configs/common/generic/x86/CONFIG_PINCTRL_METEORPOINT | 0
redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_BAYTRAIL | 1 -
redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_BROXTON | 1 -
redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_GEMINILAKE | 1 -
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_ALDERLAKE | 1 -
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_ELKHARTLAKE | 1 -
redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_LAKEFIELD | 1 -
redhat/configs/fedora/generic/CONFIG_PINCTRL_CANNONLAKE | 1 -
redhat/configs/fedora/generic/CONFIG_PINCTRL_JASPERLAKE | 1 -
redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_BROXTON | 1 -
redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_CANNONLAKE | 1 -
redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_CEDARFORK | 1 -
redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_CHERRYVIEW => redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_CHERRYVIEW | 0
redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_JASPERLAKE | 1 -
redhat/configs/rhel/generic/CONFIG_PINCTRL_BROXTON | 1 -
redhat/configs/rhel/generic/CONFIG_PINCTRL_CHERRYVIEW | 1 -
redhat/configs/rhel/generic/CONFIG_PINCTRL_ICELAKE | 1 -
redhat/configs/rhel/generic/CONFIG_PINCTRL_INTEL_PLATFORM | 1 -
redhat/configs/rhel/generic/CONFIG_PINCTRL_JASPERLAKE | 1 -
redhat/configs/rhel/generic/CONFIG_PINCTRL_METEORPOINT | 1 -
31 files changed, 0 insertions(+), 18 deletions(-)
2 months, 2 weeks
✅ PASS (MISSED 4 of 113): Test report for 6.7.5-200.fc39 (kernel-fedora)
by cki-project@redhat.com
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 113649681
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/130037
One or more kernel tests failed:
We also see the following known issues which are not related to your changes:
Issue: [rawhide] avc: denied { checkpoint_restore } for pid=793 comm="agetty" capability=40 scontext=system_u:system_r:getty_t:s0-s0:c0.c1023 tcontext=system_u:system_r:getty_t:s0-s0:c0.c1023 tclass=capability2 permissive=1
URL: https://bugzilla.redhat.com/show_bug.cgi?id=2259622
Affected tests:
aarch64 - Boot test
aarch64 - stress: stress-ng - interrupt
aarch64 - Reboot test
ppc64le - Boot test
ppc64le - Reboot test
s390x - Boot test
s390x - Reboot test
x86_64 - Boot test
x86_64 - Reboot test
Issue: NFS Connectathon: SELinux prevents rpcbind
URL: https://bugzilla.redhat.com/1758147
Affected tests:
ppc64le - Filesystem - NFS Connectathon
Tests that were not ran because of internal issues:
s390x - stress: stress-ng - cpu
s390x - stress: stress-ng - cpu-cache
s390x - stress: stress-ng - memory
s390x - Reboot test
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
2 months, 3 weeks
[OS-BUILD PATCHv2] Fix binutils breakage
by Don Zickus (via Email Bridge)
From: Don Zickus <dzickus(a)redhat.com>
Fix binutils breakage
The binutils package in Rawhide has stricter checks about PIE/PIC code
and will start reporting errors if it detects mixing and matching no-PIE
with PIE binaries (especially around bpf binaries).
Example errors look like:
/usr/bin/ld: /tmp/ccL7dkfR.o: relocation R_X86_64_32S against `.rodata'
can not be used when making a PIE object; recompile with -fPIE
/usr/bin/ld: failed to set dynamic section sizes: bad value
collect2: error: ld returned 1 exit status
Fix this by adding more CFLAGS to force PIE/PIC generated binaries to
bpf releated selftests, tools and samples.
This patch was provided by Carlos O'Donell and understands how it works.
I am just the middle man.
All -fPIE errors are resolved except for one about libbpf.a. The static
version of the library doesn't take CFLAGS so it can't be forced to
build with PIE/PIC. This error is ignored by the spec file, so it is
ignored by this patch too.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2769,7 +2769,7 @@ if [ ! -f include/generated/autoconf.h ]; then
%{make} %{?_smp_mflags} modules_prepare
fi
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true
+%{make} %{?_smp_mflags} TPROGS_USER_CFLAGS="%{?build_hostcflags}" TPROGS_USER_LDFLAGS="%{?build_hostldflags}" EXTRA_CFLAGS="%{?build_hostcflags}" EXTRA_LDFLAGS="%{?build_hostldflags}" ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true
# Prevent bpf selftests to build bpftool repeatedly:
export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
@@ -2783,7 +2783,7 @@ pushd tools/testing/selftests
force_targets=""
%endif
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
+%{make} %{?_smp_mflags} USERCFLAGS="%{?build_hostcflags}" USERLDFLAGS="%{?build_hostldflags}" ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2749
2 months, 3 weeks
[OS-BUILD PATCHv3] Enable merge-rt pipeline
by Don Zickus (via Email Bridge)
From: Don Zickus <dzickus(a)redhat.com>
Enable merge-rt pipeline
Add the gitlab-ci.yaml changes to enable a scheduled pipeline.
Also modify the ark-merge-rt.sh script to use OS_BUILD_BASE as the base
for the rt and automotive branches if they don't already exist. This
avoids the giant config creation output if we use upstream-rt as the
base and merge in os-build. The problem with that output is it
overflows the gitlab ci output buffer and you can't see the full output.
This is only seen the first time it is created or when run locally for
the first time.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -446,6 +446,16 @@ rawhide_release:
- *only-os-build-schedule
- if: $RAWHIDE_RELEASE == "true"
+merge_rt_automotive:
+ extends: .scheduled_setup
+ script:
+ - git remote add linux-rt-devel git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git
+ - DIST_PUSH=1 redhat/scripts/ci/ark-merge-rt.sh
+ retry: 2
+ rules:
+ - *only-os-build-schedule
+ - if: $RAWHIDE_RELEASE == "rt"
+
test_makefile:
image: quay.io/fedora/fedora:rawhide
variables:
diff --git a/redhat/scripts/ci/ark-merge-rt.sh b/redhat/scripts/ci/ark-merge-rt.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-merge-rt.sh
+++ b/redhat/scripts/ci/ark-merge-rt.sh
@@ -103,18 +103,6 @@ else
die "Neither version ($OS_BUILD_VER, $OS_BUILD_VER_prev) in upstream tree: $UPSTREAM_RT_TREE_NAME"
fi
-# verify the core branches exist or use provided defaults
-UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt"
-ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$RT_AUTOMATED_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$RT_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-
-MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")"
-RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)"
-RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)"
-AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)"
-
OS_BUILD_BASE_BRANCH="os-build"
RT_REBASE=""
@@ -124,6 +112,18 @@ if test "$UPSTREAM_RT_DEVEL_VER" != "$OS_BUILD_VER"; then
OS_BUILD_BASE_BRANCH="kernel-${MASTER_RT_DEVEL_VER}.0-0"
fi
+# verify the core branches exist or use provided defaults
+UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt"
+ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
+ark_git_branch "$RT_AUTOMATED_BRANCH" "$OS_BUILD_BASE_BRANCH"
+ark_git_branch "$RT_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH"
+ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH"
+
+MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")"
+RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)"
+RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)"
+AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)"
+
# sanity check, sometimes broken scripts leave a mess
if test "$MASTER_RT_DEVEL_VER" != "$UPSTREAM_RT_DEVEL_VER" -o \
"$MASTER_RT_DEVEL_VER" != "$RT_AUTOMATED_VER" -o \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2942
2 months, 3 weeks
[OS-BUILD PATCH] RHMAINTAINERS: Update for Feb 16 2024
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
RHMAINTAINERS: Update for Feb 16 2024
Update RHMAINTAINERS to latest.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
index blahblah..blahblah 100644
--- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
+++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
@@ -514,6 +514,9 @@ F: drivers/block/
BLUETOOTH SUBSYSTEM
M: David Marlin <dmarlin(a)redhat.com>
+R: Bastien Nocera <bnocera(a)redhat.com>
+R: Desnes Nunes <desnesn(a)redhat.com>
+R: José Ignacio Tornos Martínez <jtornosm(a)redhat.com>
S: Supported
F: drivers/bluetooth/
F: include/net/bluetooth/
@@ -1163,7 +1166,6 @@ M: Adam Jackson <ajax(a)redhat.com>
M: Lyude Paul <lyude(a)redhat.com>
R: Michel Dänzer <mdaenzer(a)redhat.com>
R: Karol Herbst <kherbst(a)redhat.com>
-R: Ben Skeggs <bskeggs(a)redhat.com>
R: Jocelyn Falempe <jfalempe(a)redhat.com>
R: Mika Penttilä <mpenttil(a)redhat.com>
S: Supported
@@ -1465,6 +1467,16 @@ F: include/linux/dma-iommu.h
F: include/linux/of_iommu.h
F: include/uapi/linux/iommu.h
+io_uring
+M: Jeff Moyer <jmoyer(a)redhat.com>
+R: Brian Foster <bfoster(a)redhat.com>
+R: Ming Lei <ming.lei(a)redhat.com>
+S: Maintained
+F: include/uapi/linux/io_uring.h
+F: include/linux/io_uring.h
+F: include/linux/io_uring_types.h
+F: io_uring/
+
IPMI SUBSYSTEM
M: Tony Camuso <tcamuso(a)redhat.com>
S: Supported
@@ -2093,6 +2105,7 @@ F: lib/nlattr.c
F: tools/testing/selftests/net/
F: tools/testing/selftests/wireguard/
X: Documentation/networking/arcnet*
+X: Documentation/networking/caif/
X: Documentation/networking/can.rst
X: Documentation/networking/can_ucan_protocol.rst
X: Documentation/networking/device_drivers/
@@ -2910,6 +2923,8 @@ F: include/linux/thermal.h
THUNDERBOLT SUBSYSTEM
M: Desnes Nunes <desnesn(a)redhat.com>
R: Jarod Wilson <jarod(a)redhat.com>
+R: David Marlin <dmarlin(a)redhat.com>
+R: José Ignacio Tornos Martínez <jtornosm(a)redhat.com>
S: Supported
F: drivers/net/thunderbolt.c
F: drivers/net/thunderbolt/
@@ -2993,11 +3008,14 @@ F: include/ufs/
USB network drivers
M: José Ignacio Tornos Martínez <jtornosm(a)redhat.com>
+R: Desnes Nunes <desnesn(a)redhat.com>
S: Supported
F: drivers/net/usb/
USB SUBSYSTEM
M: Desnes Nunes <desnesn(a)redhat.com>
+R: José Ignacio Tornos Martínez <jtornosm(a)redhat.com>
+R: Bastien Nocera <bnocera(a)redhat.com>
S: Supported
F: drivers/usb/
F: drivers/media/usb/
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2944
2 months, 3 weeks
[OS-BUILD PATCHv2] Enable merge-rt pipeline
by Don Zickus (via Email Bridge)
From: Don Zickus <dzickus(a)redhat.com>
Enable merge-rt pipeline
Add the gitlab-ci.yaml changes to enable a scheduled pipeline.
Also modify the ark-merge-rt.sh script to use OS_BUILD_BASE as the base
for the rt and automotive branches if they don't already exist. This
avoids the giant config creation output if we use upstream-rt as the
base and merge in os-build. The problem with that output is it
overflows the gitlab ci output buffer and you can't see the full output.
This is only seen the first time it is created or when run locally for
the first time.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -446,6 +446,16 @@ rawhide_release:
- *only-os-build-schedule
- if: $RAWHIDE_RELEASE == "true"
+merge_rt_automotive:
+ extends: .scheduled_setup
+ script:
+ - git remote add linux-rt-devel git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git
+ - DIST_PUSH=1 redhat/scripts/ci/ark-merge-rt.sh
+ retry: 2
+ rules:
+ - *only-os-build-schedule
+ - if: $RAWHIDE_RELEASE == "rt"
+
test_makefile:
image: quay.io/fedora/fedora:rawhide
variables:
diff --git a/redhat/scripts/ci/ark-merge-rt.sh b/redhat/scripts/ci/ark-merge-rt.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-merge-rt.sh
+++ b/redhat/scripts/ci/ark-merge-rt.sh
@@ -103,18 +103,6 @@ else
die "Neither version ($OS_BUILD_VER, $OS_BUILD_VER_prev) in upstream tree: $UPSTREAM_RT_TREE_NAME"
fi
-# verify the core branches exist or use provided defaults
-UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt"
-ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$RT_AUTOMATED_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$RT_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-
-MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")"
-RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)"
-RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)"
-AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)"
-
OS_BUILD_BASE_BRANCH="os-build"
RT_REBASE=""
@@ -124,6 +112,18 @@ if test "$UPSTREAM_RT_DEVEL_VER" != "$OS_BUILD_VER"; then
OS_BUILD_BASE_BRANCH="kernel-${MASTER_RT_DEVEL_VER}.0-0"
fi
+# verify the core branches exist or use provided defaults
+UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt"
+ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
+ark_git_branch "$RT_AUTOMATED_BRANCH" "$OS_BUILD_BASE_BRANCH"
+ark_git_branch "$RT_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH"
+ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH"
+
+MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")"
+RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)"
+RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)"
+AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)"
+
# sanity check, sometimes broken scripts leave a mess
if test "$MASTER_RT_DEVEL_VER" != "$UPSTREAM_RT_DEVEL_VER" -o \
"$MASTER_RT_DEVEL_VER" != "$RT_AUTOMATED_VER" -o \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2942
2 months, 3 weeks
[OS-BUILD PATCH] Enable merge-rt pipeline
by Don Zickus (via Email Bridge)
From: Don Zickus <dzickus(a)redhat.com>
Enable merge-rt pipeline
Add the gitlab-ci.yaml changes to enable a scheduled pipeline.
Also modify the ark-merge-rt.sh script to use OS_BUILD_BASE as the base
for the rt and automotive branches if they don't already exist. This
avoids the giant config creation output if we use upstream-rt as the
base and merge in os-build. The problem with that output is it
overflows the gitlab ci output buffer and you can't see the full output.
This is only seen the first time it is created or when run locally for
the first time.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -446,6 +446,16 @@ rawhide_release:
- *only-os-build-schedule
- if: $RAWHIDE_RELEASE == "true"
+merge_rt_automotive:
+ extends: .scheduled_setup
+ script:
+ - git remote add linux-rt-devel git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git
+ - redhat/scripts/ci/ark-merge-rt.sh
+ retry: 2
+ rules:
+ - *only-os-build-schedule
+ - if: $RAWHIDE_RELEASE == "rt"
+
test_makefile:
image: quay.io/fedora/fedora:rawhide
variables:
diff --git a/redhat/scripts/ci/ark-merge-rt.sh b/redhat/scripts/ci/ark-merge-rt.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-merge-rt.sh
+++ b/redhat/scripts/ci/ark-merge-rt.sh
@@ -103,18 +103,6 @@ else
die "Neither version ($OS_BUILD_VER, $OS_BUILD_VER_prev) in upstream tree: $UPSTREAM_RT_TREE_NAME"
fi
-# verify the core branches exist or use provided defaults
-UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt"
-ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$RT_AUTOMATED_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$RT_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
-
-MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")"
-RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)"
-RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)"
-AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)"
-
OS_BUILD_BASE_BRANCH="os-build"
RT_REBASE=""
@@ -124,6 +112,18 @@ if test "$UPSTREAM_RT_DEVEL_VER" != "$OS_BUILD_VER"; then
OS_BUILD_BASE_BRANCH="kernel-${MASTER_RT_DEVEL_VER}.0-0"
fi
+# verify the core branches exist or use provided defaults
+UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt"
+ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
+ark_git_branch "$RT_AUTOMATED_BRANCH" "$OS_BUILD_BASE_BRANCH"
+ark_git_branch "$RT_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH"
+ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH"
+
+MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")"
+RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)"
+RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)"
+AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)"
+
# sanity check, sometimes broken scripts leave a mess
if test "$MASTER_RT_DEVEL_VER" != "$UPSTREAM_RT_DEVEL_VER" -o \
"$MASTER_RT_DEVEL_VER" != "$RT_AUTOMATED_VER" -o \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2942
2 months, 3 weeks
[OS-BUILD PATCH 0/2] tools/rtla: Fix Makefile compiler options for
clang
by Don Zickus (via Email Bridge)
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2918
The following errors are showing up when compiling rtla with clang:
$ make HOSTCC=clang CC=clang LLVM_IAS=1
[...]
clang -O -g -DVERSION=\"6.8.0-rc1\" -flto=auto -ffat-lto-objects
-fexceptions -fstack-protector-strong
-fasynchronous-unwind-tables -fstack-clash-protection -Wall
-Werror=format-security -Wp,-D_FORTIFY_SOURCE=2
-Wp,-D_GLIBCXX_ASSERTIONS -Wno-maybe-uninitialized
$(pkg-config --cflags libtracefs) -c -o src/utils.o src/utils.c
clang: warning: optimization flag '-ffat-lto-objects' is not supported
[-Wignored-optimization-argument]
warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean
'-Wno-uninitialized'? [-Wunknown-warning-option]
1 warning generated.
clang -o rtla -ggdb src/osnoise.o src/osnoise_hist.o src/osnoise_top.o
src/rtla.o src/timerlat_aa.o src/timerlat.o src/timerlat_hist.o
src/timerlat_top.o src/timerlat_u.o src/trace.o src/utils.o $(pkg-config
--libs libtracefs)
src/osnoise.o: file not recognized: file format not recognized
clang: error: linker command failed with exit code 1 (use -v to see
invocation)
make: *** [Makefile:110: rtla] Error 1
Solve these issues by:
- removing -ffat-lto-objects and -Wno-maybe-uninitialized if using clang
- informing the linker about -flto=auto
Reported-by: Donald Zickus <dzickus(a)redhat.com>
Signed-off-by: Daniel Bristot de Oliveira <bristot(a)kernel.org>
---
tools/tracing/rtla/Makefile | 7 ++++++-
tools/verification/rv/Makefile | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
2 months, 3 weeks
[OS-BUILD PATCH] Flip secureboot signature order
by Justin M. Forbes (via Email Bridge)
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Flip secureboot signature order
In preparation for dropping down to the single signature, we need to
flip the signature order. Once a new shim is shipped, we can then drop
down to a single signature.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -825,13 +825,13 @@ Source13: redhatsecureboot301.cer
Source14: secureboot_s390.cer
Source15: secureboot_ppc.cer
-%define secureboot_ca_1 %{SOURCE10}
-%define secureboot_ca_0 %{SOURCE11}
+%define secureboot_ca_0 %{SOURCE10}
+%define secureboot_ca_1 %{SOURCE11}
%ifarch x86_64 aarch64
-%define secureboot_key_1 %{SOURCE12}
-%define pesign_name_1 redhatsecureboot501
-%define secureboot_key_0 %{SOURCE13}
-%define pesign_name_0 redhatsecureboot301
+%define secureboot_key_0 %{SOURCE12}
+%define pesign_name_0 redhatsecureboot501
+%define secureboot_key_1 %{SOURCE13}
+%define pesign_name_1 redhatsecureboot301
%endif
%ifarch s390x
%define secureboot_key_0 %{SOURCE14}
@@ -850,12 +850,12 @@ Source11: redhatsecurebootca2.cer
Source12: redhatsecureboot401.cer
Source13: redhatsecureboot003.cer
-%define secureboot_ca_1 %{SOURCE10}
-%define secureboot_ca_0 %{SOURCE11}
-%define secureboot_key_1 %{SOURCE12}
-%define pesign_name_1 redhatsecureboot401
-%define secureboot_key_0 %{SOURCE13}
-%define pesign_name_0 redhatsecureboot003
+%define secureboot_ca_0 %{SOURCE10}
+%define secureboot_ca_1 %{SOURCE11}
+%define secureboot_key_0 %{SOURCE12}
+%define pesign_name_0 redhatsecureboot401
+%define secureboot_key_1 %{SOURCE13}
+%define pesign_name_1 redhatsecureboot003
# released_kernel
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2941
2 months, 3 weeks