diff --git a/Makefile.rhelver b/Makefile.rhelver index 939753a00..6645cf390 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 45 +RHEL_RELEASE = 46 # # RHEL_REBASE_NUM diff --git a/filtermods.py b/filtermods.py index 9d7e33da6..fbfe56c5c 100755 --- a/filtermods.py +++ b/filtermods.py @@ -706,13 +706,10 @@ def sort_kmods(depmod_pathname: str, config_str: str, variants=[], do_pictures=' def abbrev_list_for_report(alist: list[KMod]) -> str: tmp_str = [] - for kmod in alist[:2]: + for kmod in alist: if kmod.allowed_list: tmp_str.append('%s(%s)' % (kmod.name, ' '.join([x.name for x in kmod.allowed_list]))) ret = ', '.join(tmp_str) - other_len = len(alist[2:]) - if other_len > 0: - ret = ret + ' and %s other(s)' % (other_len) return ret diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 3f780a94e..4bf33a6fa 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -3890,8 +3890,8 @@ CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y # CONFIG_KARMA_PARTITION is not set # CONFIG_KASAN_EXTRA_INFO is not set -CONFIG_KASAN_GENERIC=y -# CONFIG_KASAN_HW_TAGS is not set +# CONFIG_KASAN_GENERIC is not set +CONFIG_KASAN_HW_TAGS=y CONFIG_KASAN_INLINE=y CONFIG_KASAN_KUNIT_TEST=m # CONFIG_KASAN_MODULE_TEST is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 8c6eb5709..3dcf7f713 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3890,8 +3890,8 @@ CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y # CONFIG_KARMA_PARTITION is not set # CONFIG_KASAN_EXTRA_INFO is not set -CONFIG_KASAN_GENERIC=y -# CONFIG_KASAN_HW_TAGS is not set +# CONFIG_KASAN_GENERIC is not set +CONFIG_KASAN_HW_TAGS=y CONFIG_KASAN_INLINE=y CONFIG_KASAN_KUNIT_TEST=m # CONFIG_KASAN_MODULE_TEST is not set diff --git a/kernel.changelog b/kernel.changelog index df5071cc3..3d2c20dc4 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,5 +1,28 @@ -* Wed Jun 26 2024 Justin M. Forbes [6.10.0-0.rc5.55027e689933.45] -- Linux v6.10.0-0.rc5.55027e689933 +* Thu Jun 27 2024 Fedora Kernel Team [6.10.0-0.rc5.afcd48134c58.46] +- redhat/scripts/filtermods.py: show all parent/child kmods in report (Jan Stancek) +- redhat/kernel.spec: capture filtermods.py return code (Jan Stancek) +- redhat/kernel.spec: fix run of mod-denylist (Jan Stancek) +- gitlab-ci: remove unused RHMAINTAINERS variable (Michael Hofmann) +- gitlab-ci: use environments for jobs that need access to push/gitlab secrets (Michael Hofmann) +- gitlab-ci: default to os-build for all maintenance jobs (Michael Hofmann) +- gitlab-ci: use the common git repo setup cki-gating as well (Michael Hofmann) +- gitlab-ci: help maintenance jobs to cope with missing private key (Michael Hofmann) +- gitlab-ci: use a common git repo setup for all maintenance jobs (Michael Hofmann) +- gitlab-ci: move repo setup script into script template holder (Michael Hofmann) +- gitlab-ci: move maintenance job DIST variable into common template (Michael Hofmann) +- gitlab-ci: move maintenance job rules into common template (Michael Hofmann) +- gitlab-ci: move maintenance job retry field into common template (Michael Hofmann) +- gitlab-ci: provide common non-secret schedule trigger variables (Michael Hofmann) +- gitlab-ci: rename .scheduled_setup to .git_setup (Michael Hofmann) +- gitlab-ci: move script snippets into separate template (Michael Hofmann) +- gitlab-ci: rename maintenance jobs (Michael Hofmann) +- gitlab-ci: introduce job template for maintenance jobs (Michael Hofmann) +- Linux v6.10.0-0.rc5.afcd48134c58 +Resolves: + +* Wed Jun 26 2024 Fedora Kernel Team [6.10.0-0.rc5.24ca36a562d6.45] +- Turn on KASAN_HW_TAGS for Fedora aarch64 debug kernels (Justin M. Forbes) +- Linux v6.10.0-0.rc5.24ca36a562d6 Resolves: * Tue Jun 25 2024 Fedora Kernel Team [6.10.0-0.rc5.44] diff --git a/kernel.spec b/kernel.spec index b2f1fb70f..dfffeca71 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc5.20240626git55027e689933.45 +%define pkgrelease 0.rc5.20240627gitafcd48134c58.46 %define kversion 6 -%define tarfile_release 6.10-rc5-18-g55027e689933 +%define tarfile_release 6.10-rc5-35-gafcd48134c58 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20240626git55027e689933.45%{?buildid}%{?dist} +%define specrelease 0.rc5.20240627gitafcd48134c58.46%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -2662,25 +2662,28 @@ BuildKernel() { local absolute_file_list="$3" # if 1, this adds also all kmod directories to absolute_file_list local add_all_dirs="$4" + local run_mod_deny="$5" - if [ "$module_subdir" == "kernel" ]; then - # make kmod paths absolute - sed -e 's|^kernel/|/lib/modules/'$KernelVer'/kernel/|' %{?zipsed} $relative_kmod_list > $absolute_file_list - else + if [ "$module_subdir" != "kernel" ]; then # move kmods into subdirs if needed (internal, partner, extra,..) move_kmod_list $relative_kmod_list $module_subdir - # make kmod paths absolute - sed -e 's|^kernel/|/lib/modules/'$KernelVer'/'$module_subdir'/|' $relative_kmod_list > $absolute_file_list + fi + + # make kmod paths absolute + sed -e 's|^kernel/|/lib/modules/'$KernelVer'/'$module_subdir'/|' $relative_kmod_list > $absolute_file_list + + if [ "$run_mod_deny" -eq 1 ]; then # run deny-mod script, this adds blacklist-* files to absolute_file_list %{SOURCE20} "$RPM_BUILD_ROOT" lib/modules/$KernelVer $absolute_file_list + fi + %if %{zipmodules} - # deny-mod script works with kmods as they are now (not compressed), - # but if they will be we need to add compext to all - sed -i %{?zipsed} $absolute_file_list + # deny-mod script works with kmods as they are now (not compressed), + # but if they will be we need to add compext to all + sed -i %{?zipsed} $absolute_file_list %endif - # add also dir for the case when there are no kmods - echo "%dir /lib/modules/$KernelVer/$module_subdir" >> $absolute_file_list - fi + # add also dir for the case when there are no kmods + echo "%dir /lib/modules/$KernelVer/$module_subdir" >> $absolute_file_list if [ "$add_all_dirs" -eq 1 ]; then (cd $RPM_BUILD_ROOT; find lib/modules/$KernelVer/kernel -mindepth 1 -type d | sort -n) > ../module-dirs.list @@ -2699,8 +2702,9 @@ BuildKernel() { fi # this creates ../modules-*.list output, where each kmod path is as it # appears in modules.dep (relative to lib/modules/$KernelVer) - %{SOURCE22} -l "../filtermods-$KernelVer.log" sort -d $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep -c configs/def_variants.yaml $variants_param -o .. - if [ $? -ne 0 ]; then + ret=0 + %{SOURCE22} -l "../filtermods-$KernelVer.log" sort -d $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep -c configs/def_variants.yaml $variants_param -o .. || ret=$? + if [ $ret -ne 0 ]; then echo "8< --- filtermods-$KernelVer.log ---" cat "../filtermods-$KernelVer.log" echo "--- filtermods-$KernelVer.log --- >8" @@ -2711,15 +2715,15 @@ BuildKernel() { exit 1 fi - create_module_file_list "kernel" ../modules-core.list ../kernel${Variant:+-${Variant}}-modules-core.list 1 - create_module_file_list "kernel" ../modules.list ../kernel${Variant:+-${Variant}}-modules.list 0 - create_module_file_list "internal" ../modules-internal.list ../kernel${Variant:+-${Variant}}-modules-internal.list 0 - create_module_file_list "kernel" ../modules-extra.list ../kernel${Variant:+-${Variant}}-modules-extra.list 0 + create_module_file_list "kernel" ../modules-core.list ../kernel${Variant:+-${Variant}}-modules-core.list 1 0 + create_module_file_list "kernel" ../modules.list ../kernel${Variant:+-${Variant}}-modules.list 0 0 + create_module_file_list "internal" ../modules-internal.list ../kernel${Variant:+-${Variant}}-modules-internal.list 0 1 + create_module_file_list "kernel" ../modules-extra.list ../kernel${Variant:+-${Variant}}-modules-extra.list 0 1 if [[ "$Variant" == "rt" || "$Variant" == "rt-debug" ]]; then - create_module_file_list "kvm" ../modules-rt-kvm.list ../kernel${Variant:+-${Variant}}-modules-rt-kvm.list 0 + create_module_file_list "kvm" ../modules-rt-kvm.list ../kernel${Variant:+-${Variant}}-modules-rt-kvm.list 0 1 fi %if 0%{!?fedora:1} - create_module_file_list "partner" ../modules-partner.list ../kernel${Variant:+-${Variant}}-modules-partner.list 1 0 + create_module_file_list "partner" ../modules-partner.list ../kernel${Variant:+-${Variant}}-modules-partner.list 1 1 %endif fi # $DoModules -eq 1 @@ -4020,8 +4024,30 @@ fi\ # # %changelog -* Wed Jun 26 2024 Justin M. Forbes [6.10.0-0.rc5.55027e689933.45] -- Linux v6.10.0-0.rc5.55027e689933 +* Thu Jun 27 2024 Fedora Kernel Team [6.10.0-0.rc5.afcd48134c58.46] +- redhat/scripts/filtermods.py: show all parent/child kmods in report (Jan Stancek) +- redhat/kernel.spec: capture filtermods.py return code (Jan Stancek) +- redhat/kernel.spec: fix run of mod-denylist (Jan Stancek) +- gitlab-ci: remove unused RHMAINTAINERS variable (Michael Hofmann) +- gitlab-ci: use environments for jobs that need access to push/gitlab secrets (Michael Hofmann) +- gitlab-ci: default to os-build for all maintenance jobs (Michael Hofmann) +- gitlab-ci: use the common git repo setup cki-gating as well (Michael Hofmann) +- gitlab-ci: help maintenance jobs to cope with missing private key (Michael Hofmann) +- gitlab-ci: use a common git repo setup for all maintenance jobs (Michael Hofmann) +- gitlab-ci: move repo setup script into script template holder (Michael Hofmann) +- gitlab-ci: move maintenance job DIST variable into common template (Michael Hofmann) +- gitlab-ci: move maintenance job rules into common template (Michael Hofmann) +- gitlab-ci: move maintenance job retry field into common template (Michael Hofmann) +- gitlab-ci: provide common non-secret schedule trigger variables (Michael Hofmann) +- gitlab-ci: rename .scheduled_setup to .git_setup (Michael Hofmann) +- gitlab-ci: move script snippets into separate template (Michael Hofmann) +- gitlab-ci: rename maintenance jobs (Michael Hofmann) +- gitlab-ci: introduce job template for maintenance jobs (Michael Hofmann) +- Linux v6.10.0-0.rc5.afcd48134c58 + +* Wed Jun 26 2024 Fedora Kernel Team [6.10.0-0.rc5.24ca36a562d6.45] +- Turn on KASAN_HW_TAGS for Fedora aarch64 debug kernels (Justin M. Forbes) +- Linux v6.10.0-0.rc5.24ca36a562d6 * Tue Jun 25 2024 Fedora Kernel Team [6.10.0-0.rc5.44] - redhat: kernel.spec: add missing sound/soc/sof/sof-audio.h to kernel-devel package (Jaroslav Kysela) diff --git a/sources b/sources index 6d83fb11b..5ba67150e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.10-rc5-18-g55027e689933.tar.xz) = cfa04d95c5a1c38b614a6196a20f9cde92547c6b1f215fe9bcb7e544d047c39a072801f71751649d49c667186bad046013e4b693d48ef67677dc38c92b4ad524 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = e9896786ed33c36573d6646f773f26128ad6a67e5f27fe8b06f8aa5a314003bbe5dab5354bc928d3c4b41cc05b88d8865bbd505441e83256d8964f9c18950d53 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 8bac5e4668ba5dd4df8fecb6a99504cf91021b26d39139d7af6fee9dd069446ee49fa6159de55ecbd56580c5b792903648b31b988f390e04a13db571f2fe9af6 +SHA512 (linux-6.10-rc5-35-gafcd48134c58.tar.xz) = a5040de6c4c07e307caeb1d68102d89ef98a6f646b5a1436eb9eaabcede5c9d10ee99210f739d03aa344d06ac8d96f5b960a2b1155d6f7bf9249c86cddc2daec +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = bd26dbc12e6ff215b4a65437f99ca66a74bf00bedcfaa76cb711ad30316ef243ecdc75b02d2a91693ce982737c66de0936b9d0a491a3bd77daad85a54fbf1e99 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 972888419620954cf77ec127b6e59cd5cf3d2bb1f31d593247cc253642450435d801526c6e3168cc3d08b6d1fd4a14ae927aa14209011ec4851aa42b32063ef5