From a423b102483d5ef9aca9e84921622ead65e6fe09b0c5b5220298348cfdb26ad0 Mon Sep 17 00:00:00 2001 From: Kernel Bugs Date: Thu, 30 Sep 2021 08:05:44 +0000 Subject: [PATCH] commit 4ae263c462a0821a92b81bcc659288f35a430bca OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1600 --- config.tar.bz2 | 4 +- dtb-aarch64.changes | 7 + dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 7 + dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 7 + dtb-armv7l.spec | 2 +- dtb-riscv64.changes | 7 + dtb-riscv64.spec | 2 +- kernel-64kb.changes | 7 + kernel-64kb.spec | 8 +- kernel-binary.spec.in | 240 ++++++++++++++++---------------- kernel-cert-subpackage | 51 +++++-- kernel-debug.changes | 7 + kernel-debug.spec | 8 +- kernel-default.changes | 7 + kernel-default.spec | 8 +- kernel-docs.changes | 7 + kernel-docs.spec | 4 +- kernel-kvmsmall.changes | 7 + kernel-kvmsmall.spec | 8 +- kernel-lpae.changes | 7 + kernel-lpae.spec | 8 +- kernel-module-subpackage | 39 +++--- kernel-obs-build.changes | 7 + kernel-obs-build.spec | 4 +- kernel-obs-qa.changes | 7 + kernel-obs-qa.spec | 2 +- kernel-pae.changes | 7 + kernel-pae.spec | 8 +- kernel-source.changes | 7 + kernel-source.spec | 4 +- kernel-source.spec.in | 4 + kernel-subpackage-build | 3 +- kernel-subpackage-spec | 8 +- kernel-syms.changes | 7 + kernel-syms.spec | 4 +- kernel-vanilla.changes | 7 + kernel-vanilla.spec | 8 +- kernel-zfcpdump.changes | 7 + kernel-zfcpdump.spec | 8 +- patches.kernel.org.tar.bz2 | 4 +- patches.suse.tar.bz2 | 4 +- post.sh | 91 ++++++++++++ postun.sh | 31 +++++ pre.sh | 62 +++++++++ preun.sh | 0 series.conf | 278 +------------------------------------ source-timestamp | 4 +- 49 files changed, 552 insertions(+), 480 deletions(-) create mode 100644 post.sh create mode 100644 postun.sh create mode 100644 pre.sh create mode 100644 preun.sh diff --git a/config.tar.bz2 b/config.tar.bz2 index ca5c6a69..7e841b82 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f82ec27231c858a41aca5a2a1b6aa0a1a973bcd5c3aa4f906ce488463bb44dea -size 295033 +oid sha256:b60baf3c2904bde77c4cb4224a4a35a30028a3fcc00b32dd67018440b0688007 +size 294729 diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index cb62c6e6..d9d6b268 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 3bb9f4c6..f8b44044 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index cb62c6e6..d9d6b268 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index f2137e2c..715e1721 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index cb62c6e6..d9d6b268 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index a8fdfde9..c58eba40 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif diff --git a/dtb-riscv64.changes b/dtb-riscv64.changes index cb62c6e6..d9d6b268 100644 --- a/dtb-riscv64.changes +++ b/dtb-riscv64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/dtb-riscv64.spec b/dtb-riscv64.spec index 45507e2b..9115d7f7 100644 --- a/dtb-riscv64.spec +++ b/dtb-riscv64.spec @@ -31,7 +31,7 @@ Name: dtb-riscv64 Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 79b35eb3..b9d91f6f 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -119,7 +119,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -241,10 +241,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa -Provides: kernel-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: kernel-%build_flavor-base-srchash-4ae263c462a0821a92b81bcc659288f35a430bca +Provides: kernel-srchash-4ae263c462a0821a92b81bcc659288f35a430bca # END COMMON DEPS -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index fcc72c33..c59a6ec3 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -108,8 +108,10 @@ done ) %if 0%{?usrmerged} %define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor +%define systemmap %{modules_dir}/System.map %else %define modules_dir /lib/modules/%kernelrelease-%build_flavor +%define systemmap /boot/System.map-%kernelrelease-%build_flavor %endif @@ -173,8 +175,6 @@ Recommends: kernel-firmware %endif # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS -Requires(pre): suse-kernel-rpm-scriptlets -Requires(postun): suse-kernel-rpm-scriptlets Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools @@ -648,13 +648,51 @@ fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed echo Signing certificates "%certs" -if test %CONFIG_MODULE_SIG = "y" -a -d %_sourcedir/.kernel_signing_certs ; then +certs=(%certs) +if test %CONFIG_MODULE_SIG = "y"; then for f in %_sourcedir/.kernel_signing_certs/*.crt; do mkdir -p %buildroot/etc/uefi/certs cp -v $f %buildroot/etc/uefi/certs done fi + for script in preun postun pre post; do + if test %build_flavor = "zfcpdump"; then + : >%my_builddir/$script.sh + continue + fi + sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ + -e "s:@IMAGE@:%image:g" \ + -e "s:@FLAVOR""@:%build_flavor:g" \ + -e "s:@PACKAGE@:%name:g" \ + -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ + -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ + -e "s:@SRCVARIANT@:%variant:g" \ + -e "s:@MODULESDIR@:%modules_dir:g" \ + -e "s:@SYSTEMMAP@:%systemmap:g" \ +%if 0%{?usrmerged} + -e "s:^@USRMERGE@::" \ +%else + -e "/^@USRMERGE@/d" \ +%endif + %_sourcedir/$script.sh > %my_builddir/$script.sh + if test "${#certs[@]}" -gt 0; then + case "$script" in + preun | postun | post) + # Copy the respective scriptlet from kernel-cert-subpackage + sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \ + %_sourcedir/kernel-cert-subpackage \ + >>"%my_builddir/$script.sh" + esac + fi + # Do an exit 0 at the end of each scriptlet. If the last real command + # in the scriptlet (e.g. update-bootloader call, see bnc#809617) + # returns an error, we do not want to amplify the damage by leaving + # the system in an inconsistent state. + echo "exit 0" >>"%my_builddir/$script.sh" + done + cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do @@ -1023,41 +1061,14 @@ fi # /usr/src/linux-obj intentionally, to not accidentally break timestamps there %fdupes %buildroot%modules_dir -%pre -%if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" -%endif -%post -%if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" -%endif -%preun -%if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" -%endif -%postun -%if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" -%endif -%posttrans -%if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" -%endif +%preun -f preun.sh + +%postun -f postun.sh + +%pre -f pre.sh + +%post -f post.sh + %files -f kernel-main.files %defattr(-, root, root) @@ -1090,35 +1101,34 @@ This package contains additional modules not supported by SUSE. %source_timestamp -%pre extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "%name-extra" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - %post extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "%name-extra" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - -%preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - -%postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" +wm2=/usr/lib/module-init-tools/weak-modules2 +nvr=%name-extra-%version-%release +if test -x "$wm2"; then + rpm -ql "$nvr" | INITRD_IN_POSTTRANS=1 /bin/bash -${-/e/} "$wm2" \ + --add-kernel-modules %kernelrelease-%build_flavor +fi %posttrans extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "%name-extra" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" +%{?regenerate_initrd_posttrans} + +%preun extra +nvr=%name-extra-%version-%release +rpm -ql "$nvr" | sed -n '/\.ko\(\.xz\|\.gz\|\.zst\)\?$/p' > "/var/run/rpm-$nvr-modules" + +%postun extra +wm2=/usr/lib/module-init-tools/weak-modules2 +nvr=%name-extra-%version-%release +modules=( $(cat "/var/run/rpm-$nvr-modules") ) +rm -f "/var/run/rpm-$nvr-modules" +if [ ${#modules[*]} = 0 ]; then + echo "WARNING: $nvr does not contain any kernel modules" >&2 + exit 0 +fi +if test -x "$wm2"; then + printf '%s\n' "${modules[@]}" | /bin/bash -${-/e/} "$wm2" \ + --remove-kernel-modules %kernelrelease-%build_flavor +fi %if %split_extra @@ -1154,35 +1164,34 @@ This package contains optional modules only for openSUSE Leap. %source_timestamp -%pre optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "%name-optional" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - %post optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "%name-optional" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - -%preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - -%postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" +wm2=/usr/lib/module-init-tools/weak-modules2 +nvr=%name-optional-%version-%release +if test -x "$wm2"; then + rpm -ql "$nvr" | INITRD_IN_POSTTRANS=1 /bin/bash -${-/e/} "$wm2" \ + --add-kernel-modules %kernelrelease-%build_flavor +fi %posttrans optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "%name-optional" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" +%{?regenerate_initrd_posttrans} + +%preun optional +nvr=%name-optional-%version-%release +rpm -ql "$nvr" | sed -n '/\.ko\(\.xz\|\.gz\|\.zst\)\?$/p' > "/var/run/rpm-$nvr-modules" + +%postun optional +wm2=/usr/lib/module-init-tools/weak-modules2 +nvr=%name-optional-%version-%release +modules=( $(cat "/var/run/rpm-$nvr-modules") ) +rm -f "/var/run/rpm-$nvr-modules" +if [ ${#modules[*]} = 0 ]; then + echo "WARNING: $nvr does not contain any kernel modules" >&2 + exit 0 +fi +if test -x "$wm2"; then + printf '%s\n' "${modules[@]}" | /bin/bash -${-/e/} "$wm2" \ + --remove-kernel-modules %kernelrelease-%build_flavor +fi %files optional -f kernel-optional.files %defattr(-, root, root) @@ -1321,35 +1330,34 @@ Requires(post): suse-module-tools >= 12.4 %description -n @KMP_NAME@-%build_flavor @KMP_DESCRIPTION@ -%pre -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "@KMP_NAME@-%build_flavor" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - %post -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "@KMP_NAME@-%build_flavor" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - -%preun -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "@KMP_NAME@-%build_flavor" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" - -%postun -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "@KMP_NAME@-%build_flavor" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" +wm2=/usr/lib/module-init-tools/weak-modules2 +nvr=@KMP_NAME@-%build_flavor-%version-%release +if test -x "$wm2"; then + rpm -ql "$nvr" | INITRD_IN_POSTTRANS=1 /bin/bash -${-/e/} "$wm2" \ + --add-kernel-modules %kernelrelease-%build_flavor +fi %posttrans -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "@KMP_NAME@-%build_flavor" \ - --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ - --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" +%{?regenerate_initrd_posttrans} + +%preun -n @KMP_NAME@-%build_flavor +nvr=@KMP_NAME@-%build_flavor-%version-%release +rpm -ql "$nvr" | sed -n '/\.ko\(\.xz\|\.gz\|\.zst\)\?$/p' > "/var/run/rpm-$nvr-modules" + +%postun -n @KMP_NAME@-%build_flavor +wm2=/usr/lib/module-init-tools/weak-modules2 +nvr=@KMP_NAME@-%build_flavor-%version-%release +modules=( $(cat "/var/run/rpm-$nvr-modules") ) +rm -f "/var/run/rpm-$nvr-modules" +if [ ${#modules[*]} = 0 ]; then + echo "WARNING: $nvr does not contain any kernel modules" >&2 + exit 0 +fi +if test -x "$wm2"; then + printf '%s\n' "${modules[@]}" | /bin/bash -${-/e/} "$wm2" \ + --remove-kernel-modules %kernelrelease-%build_flavor +fi %files -n @KMP_NAME@-%build_flavor -f @KMP_NAME@.files %defattr(-, root, root) diff --git a/kernel-cert-subpackage b/kernel-cert-subpackage index a0e61cbd..edc62ebb 100644 --- a/kernel-cert-subpackage +++ b/kernel-cert-subpackage @@ -1,26 +1,55 @@ %package -n %{-n*}-ueficert Summary: UEFI Secure Boot Certificate For Package %{-n*}-kmp Group: System/Kernel -Requires(post): suse-kernel-rpm-scriptlets -Requires(pre): suse-kernel-rpm-scriptlets %description -n %{-n*}-ueficert This package contains the UEFI Secure Boot certificate used to sign modules in the %{-n*}-kmp packages. -%pre -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-pre --certs "@CERTS@" "$@" - +# The scriptlets are reused in kernel-binary.spec.in by a sed script that +# stops at the next line that starts with a percent sign %post -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-post --certs "@CERTS@" "$@" +if ! command -v mokutil >/dev/null; then + exit 0 +fi +# Only apply CA check on the kernel package certs (bsc#1173115) +if [ %{defined _suse_kernel_module_subpackage} = 0 ] && mokutil -h | grep -q "ca-check"; then + MOK_ARG="--ca-check" +else + MOK_ARG="" +fi +# XXX: Only call mokutil if UEFI and shim are used +for cert in @CERTS@; do + cert="/etc/uefi/certs/${cert}.crt" + if ! mokutil --import "$cert" --root-pw ${MOK_ARG}; then + echo "Failed to import $cert" + fi +done +exit 0 %preun -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-preun --certs "@CERTS@" "$@" +if ! command -v mokutil >/dev/null; then + exit 0 +fi +for cert in @CERTS@; do + cert="/etc/uefi/certs/${cert}.crt" + ln "$cert" "$cert.delete" +done +exit 0 %postun -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-postun --certs "@CERTS@" "$@" - -%posttrans -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-posttrans --certs "@CERTS@" "$@" +if ! command -v mokutil >/dev/null; then + exit 0 +fi +for cert in @CERTS@; do + cert="/etc/uefi/certs/${cert}.crt" + if ! test -e "$cert"; then + if ! mokutil --delete "$cert.delete" --root-pw; then + echo "Failed to delete $cert" + fi + fi + rm "$cert.delete" +done +exit 0 %files -n %{-n*}-ueficert %defattr(-, root, root) diff --git a/kernel-debug.changes b/kernel-debug.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 550de7b2..e0eafd5e 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -119,7 +119,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -241,10 +241,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa -Provides: kernel-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: kernel-%build_flavor-base-srchash-4ae263c462a0821a92b81bcc659288f35a430bca +Provides: kernel-srchash-4ae263c462a0821a92b81bcc659288f35a430bca # END COMMON DEPS -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 diff --git a/kernel-default.changes b/kernel-default.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index 305b0ec5..f63c1b7b 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -119,7 +119,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -241,10 +241,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa -Provides: kernel-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: kernel-%build_flavor-base-srchash-4ae263c462a0821a92b81bcc659288f35a430bca +Provides: kernel-srchash-4ae263c462a0821a92b81bcc659288f35a430bca # END COMMON DEPS -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 diff --git a/kernel-docs.changes b/kernel-docs.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index c12aa4ca..44b5b216 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0-only Group: Documentation/Man Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -64,7 +64,7 @@ BuildRequires: texlive-zapfding %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index b4c0ce64..21b1b56c 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -119,7 +119,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -241,10 +241,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa -Provides: kernel-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: kernel-%build_flavor-base-srchash-4ae263c462a0821a92b81bcc659288f35a430bca +Provides: kernel-srchash-4ae263c462a0821a92b81bcc659288f35a430bca # END COMMON DEPS -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/kernel-lpae.changes b/kernel-lpae.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 8ec33885..019a31da 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -119,7 +119,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -241,10 +241,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa -Provides: kernel-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: kernel-%build_flavor-base-srchash-4ae263c462a0821a92b81bcc659288f35a430bca +Provides: kernel-srchash-4ae263c462a0821a92b81bcc659288f35a430bca # END COMMON DEPS -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/kernel-module-subpackage b/kernel-module-subpackage index 6ba181ee..61442ac6 100644 --- a/kernel-module-subpackage +++ b/kernel-module-subpackage @@ -69,26 +69,29 @@ in_desc { print; good = 1 } END { exit(! good) } ' $spec ) -%pre -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-pre --name "%{-n*}-kmp-%1" \ - --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %post -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-post --name "%{-n*}-kmp-%1" \ - --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" -%preun -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \ - --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" -%postun -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \ - --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" +nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*} +wm2=/usr/lib/module-init-tools/weak-modules2 +if [ -x $wm2 ]; then + %{-b:KMP_NEEDS_MKINITRD=1} INITRD_IN_POSTTRANS=1 /bin/bash -${-/e/} $wm2 --add-kmp $nvr +fi %posttrans -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-posttrans --name "%{-n*}-kmp-%1" \ - --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" +%{?regenerate_initrd_posttrans} +%preun -n %{-n*}-kmp-%1 +nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*} +rpm -ql $nvr | sed -n '/\.ko\(\.xz\|\.gz\|\.zst\)\?$/p' > /var/run/rpm-$nvr-modules +%postun -n %{-n*}-kmp-%1 +nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*} +modules=( $(cat /var/run/rpm-$nvr-modules) ) +rm -f /var/run/rpm-$nvr-modules +if [ ${#modules[*]} = 0 ]; then + echo "WARNING: $nvr does not contain any kernel modules" >&2 + exit 0 +fi +wm2=/usr/lib/module-init-tools/weak-modules2 +if [ -x $wm2 ]; then + printf '%s\n' "${modules[@]}" | /bin/bash -${-/e/} $wm2 --remove-kmp $nvr +fi %files -n %{-n*}-kmp-%1 %{-f:%{expand:%(cd %_sourcedir; cat %{-f*})}} %{!-f:%defattr (-,root,root)} diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index c50b6ef2..3466d9c7 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -45,7 +45,7 @@ BuildRequires: util-linux %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +BuildRequires: kernel%kernel_flavor-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0-only Group: SLES Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index d884bb27..9769431d 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0-only Group: SLES Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index 809d35c6..4bae8f90 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -119,7 +119,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -241,10 +241,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa -Provides: kernel-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: kernel-%build_flavor-base-srchash-4ae263c462a0821a92b81bcc659288f35a430bca +Provides: kernel-srchash-4ae263c462a0821a92b81bcc659288f35a430bca # END COMMON DEPS -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 diff --git a/kernel-source.changes b/kernel-source.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index 6dac1913..393f3bd5 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -32,7 +32,7 @@ License: GPL-2.0-only Group: Development/Sources Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-source.spec.in b/kernel-source.spec.in index 8b57554e..358892b0 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -48,6 +48,10 @@ Provides: linux Provides: multiversion(kernel) Source0: @TARBALL_URL@linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc +Source10: preun.sh +Source11: postun.sh +Source12: pre.sh +Source13: post.sh Source14: series.conf Source16: guards Source17: apply-patches diff --git a/kernel-subpackage-build b/kernel-subpackage-build index bec9ee06..93c2d696 100644 --- a/kernel-subpackage-build +++ b/kernel-subpackage-build @@ -15,10 +15,9 @@ echo Ghost files: cat kernel-ghost.flist rpm -q --qf '%{PREIN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > prein.sh -rpm -q --qf '%{POSTIN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > postin.sh rpm -q --qf '%{PREUN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > preun.sh +rpm -q --qf '%{POSTIN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > postin.sh rpm -q --qf '%{POSTUN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > postun.sh -rpm -q --qf '%{POSTTRANS}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > posttrans.sh [ -z "$(rpm -q --triggers $kernel_package_name)" ] # not handled diff --git a/kernel-subpackage-spec b/kernel-subpackage-spec index 78575090..3d277c32 100644 --- a/kernel-subpackage-spec +++ b/kernel-subpackage-spec @@ -83,15 +83,13 @@ There is no reason to install this package. echo "%{?modules}" | tr ', ' '\n\n' > request-modules %scriptdir/kernel-subpackage-build %kernel_package_name %rpm_kver-%rpm_krel %package_name-%version-%release -%pre -f prein.sh - -%post -f postin.sh - %preun -f preun.sh %postun -f postun.sh -%posttrans -f posttrans.sh +%pre -f prein.sh + +%post -f postin.sh %files -f subpackage.flist diff --git a/kernel-syms.changes b/kernel-syms.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index da7e0b11..08d5dbcb 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 5.14.8 %if %using_buildservice %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -52,7 +52,7 @@ Requires: kernel-pae-devel = %version-%source_rel %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 1f4f2d3f..776ce378 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -119,7 +119,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -241,10 +241,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa -Provides: kernel-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: kernel-%build_flavor-base-srchash-4ae263c462a0821a92b81bcc659288f35a430bca +Provides: kernel-srchash-4ae263c462a0821a92b81bcc659288f35a430bca # END COMMON DEPS -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index cb62c6e6..d9d6b268 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 30 04:53:41 CEST 2021 - mbrugger@suse.com + +- arm64: Update config files. (bsc#1185927) + Set PINCTRL_ZYNQMP as build-in. +- commit 4ae263c + ------------------------------------------------------------------- Mon Sep 27 08:35:53 CEST 2021 - jslaby@suse.cz diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 2ceed93a..4bf56c92 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -119,7 +119,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.14.8 %if 0%{?is_kotd} -Release: .g06dbf6b +Release: .g4ae263c %else Release: 0 %endif @@ -241,10 +241,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa -Provides: kernel-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: kernel-%build_flavor-base-srchash-4ae263c462a0821a92b81bcc659288f35a430bca +Provides: kernel-srchash-4ae263c462a0821a92b81bcc659288f35a430bca # END COMMON DEPS -Provides: %name-srchash-06dbf6bb31e9333fa8908900183e13ca4d39c0fa +Provides: %name-srchash-4ae263c462a0821a92b81bcc659288f35a430bca %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/patches.kernel.org.tar.bz2 b/patches.kernel.org.tar.bz2 index 50d3dde1..dc4cc467 100644 --- a/patches.kernel.org.tar.bz2 +++ b/patches.kernel.org.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffb98e6e44b5fbcc7126c6f262142b2543816094bd63ef9a8ded03a89b11cae5 -size 794559 +oid sha256:9fbfd74ecb6ac54a5c754e0e57d5d8374de68de3600d1828bf2d22f325719152 +size 588298 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 6f5f4d69..a12c365d 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b70b08b067613fe9d6a88028cbf1b04f5ef3b8fb4eb56bf22900252abb83e13 -size 60863 +oid sha256:4601b962a94862ed95e82cd5f95ad380eab8cafa72e316f926f9e64e356995af +size 63555 diff --git a/post.sh b/post.sh new file mode 100644 index 00000000..7a0447e2 --- /dev/null +++ b/post.sh @@ -0,0 +1,91 @@ +# Flag to trigger /etc/init.d/purge-kernels on next reboot (fate#312018) +# ... but avoid the first installion (bsc#1180058) +test $1 -gt 1 && touch /boot/do_purge_kernels + +for x in /boot/@IMAGE@ /boot/initrd; do + rm -f $x + ln -s ${x##*/}-@KERNELRELEASE@-@FLAVOR@ $x +done +@USRMERGE@# compat stuff for /boot. +@USRMERGE@# if /boot and /usr are not speparate partitions we can just link +@USRMERGE@# the kernel there to save space. Otherwise copy. +@USRMERGE@if mountpoint -q /boot || mountpoint -q /usr; then +@USRMERGE@ copy_or_link="cp -a" +@USRMERGE@else +@USRMERGE@ copy_or_link="ln -sf" +@USRMERGE@fi +@USRMERGE@# XXX: need to fix suse-module-tools for sysctl.conf and System.map +@USRMERGE@for x in @IMAGE@ sysctl.conf System.map; do +@USRMERGE@ if [ ! -e /boot/$x-@KERNELRELEASE@-@FLAVOR@ ]; then +@USRMERGE@ $copy_or_link ..@MODULESDIR@/$x /boot/$x-@KERNELRELEASE@-@FLAVOR@ +@USRMERGE@ if [ -e @MODULESDIR@/.$x.hmac ]; then +@USRMERGE@ $copy_or_link ..@MODULESDIR@/.$x.hmac /boot/.$x-@KERNELRELEASE@-@FLAVOR@.hmac +@USRMERGE@ fi +@USRMERGE@ fi +@USRMERGE@done + +# Add symlinks of compatible modules to /lib/modules/$krel/weak-updates/, +# run depmod and mkinitrd +wm2_rc=0 +wm2=/usr/lib/module-init-tools/weak-modules2 +if [ -x $wm2 ]; then + /bin/bash -${-/e/} $wm2 --add-kernel @KERNELRELEASE@-@FLAVOR@ + wm2_rc=$? +else + echo "$wm2 does not exist, please run depmod and mkinitrd manually" >&2 + wm2_rc=-1 +fi + +message_install_bl () { + echo "You may need to setup and install the boot loader using the" + echo "available bootloader for your platform (e.g. grub, lilo, zipl, ...)." +} + +run_bootloader () { + if [ -f /etc/sysconfig/bootloader ] && + [ -f /boot/grub/menu.lst -o \ + -f /etc/lilo.conf -o \ + -f /etc/elilo.conf -o \ + -f /etc/zipl.conf -o \ + -f /etc/default/grub ] + then + return 0 + else + return 1 + fi +} + +rc=0 +if [ -f /etc/fstab -a ! -e /.buildenv ] ; then + # only run the bootloader if the usual bootloader configuration + # files are there -- this is different on every architecture + rc=-1 + initrd=initrd-@KERNELRELEASE@-@FLAVOR@ + if [ @FLAVOR@ = rt ]; then + default=force-default + fi + if [ -e /boot/$initrd -o ! -e @MODULESDIR@ ] && \ + run_bootloader ; then + [ -e /boot/$initrd ] || initrd= + if [ -x /usr/lib/bootloader/bootloader_entry ]; then + /usr/lib/bootloader/bootloader_entry \ + add \ + @FLAVOR@ \ + @KERNELRELEASE@-@FLAVOR@ \ + @IMAGE@-@KERNELRELEASE@-@FLAVOR@ \ + $initrd \ + $default + rc=$? + else + message_install_bl + fi + fi +else + message_install_bl +fi + +# check if something failed +[ $wm2_rc != 0 ] && exit $wm2_rc +exit $rc + +# vim: set sts=4 sw=4 ts=8 noet: diff --git a/postun.sh b/postun.sh new file mode 100644 index 00000000..3f477e01 --- /dev/null +++ b/postun.sh @@ -0,0 +1,31 @@ +# If a kernel package is removed before the next reboot, we assume that the +# multiversion variable in /etc/zypp/zypp.conf is not configured and we delete +# the flag again (fate#312018) +rm -f /boot/do_purge_kernels + +wm2=/usr/lib/module-init-tools/weak-modules2 +nvr=@PACKAGE@-@RPM_VERSION_RELEASE@ + +if [ -e @SYSTEMMAP@ ]; then + # the same package was reinstalled or just rebuilt, otherwise the files + # would have been deleted by now + # do not remove anything in this case (bnc#533766) + exit 0 +fi + +# Remove symlinks from @MODULESDIR@/weak-updates/. +if [ -x $wm2 ]; then + /bin/bash -${-/e/} $wm2 --remove-kernel @KERNELRELEASE@-@FLAVOR@ +fi + +# remove fstab check once perl-Bootloader can cope with it +if [ -f /etc/fstab ]; then + if [ -x /usr/lib/bootloader/bootloader_entry ]; then + /usr/lib/bootloader/bootloader_entry \ + remove \ + @FLAVOR@ \ + @KERNELRELEASE@-@FLAVOR@ \ + @IMAGE@-@KERNELRELEASE@-@FLAVOR@ \ + initrd-@KERNELRELEASE@-@FLAVOR@ + fi +fi diff --git a/pre.sh b/pre.sh new file mode 100644 index 00000000..add66123 --- /dev/null +++ b/pre.sh @@ -0,0 +1,62 @@ +# see bug #259303 +# this script runs when the kernel gets updated with YaST +# YaST calls rpm always with -U +# -U replaces all packages with the new one +# rpm removes the files from the old packages after the postinstall script ran +# this will double the required space below /boot +# remove the files from the old packages to make room for the new initrd +# rpm may complain about low disk space if /boot/vmlinux does not fit +if [ "$YAST_IS_RUNNING" != "" ]; then + mydf="$( POSIXLY_CORRECT=1 df -P /boot/ | awk '/^(\/|-[[:blank:]])/{ print $4}' )" + if test "$mydf" != "" ; then + echo "Free diskspace below /boot: $mydf blocks" + # echo "512 byte blocks: $(( 2 * 1024 * 20 ))" + if test "$mydf" -lt "40960" ; then + echo "make room for new kernel '@FLAVOR@' because there are less than 20MB available." + # disabled because it breaks patch rpms + #rm -fv /boot/@IMAGE@-*-@FLAVOR@ + rm -fv /boot/initrd-*-@FLAVOR@ + fi + fi +fi + + +# On AArch64 we switched from 64k PAGE_SIZE to 4k PAGE_SIZE. Unfortunately +# btrfs can only use file systems created with the same PAGE_SIZE. So we +# check if the user has any btrfs file systems mounted and refuse to install +# in that case. +if [ $( uname -m ) = aarch64 -a \ + "$( zgrep CONFIG_ARM64_64K_PAGES=y /proc/config.gz )" -a \ + @FLAVOR@ = default ]; then + if [ "$FORCE_4K" = 1 ]; then + # The user knows what he's doing, let him be. + exit 0 + fi + + if [ "$YAST_IS_RUNNING" = "instsys" ]; then + # We're probably test installing the kernel, that should succeed + exit 0 + fi + + cat >&2 <<-EOF + + You are running on a 64kb PAGE_SIZE kernel. The default kernel + switched to 4kb PAGE_SIZE which will prevent it from mounting btrfs + or the swap partition. + + To ensure that your system still works, I am refusing to install + this kernel. If you want to force installation regardlesss, reinstall + with the environment variable FORCE_4K set to 1. + + To stay with a 64kb PAGE_SIZE kernel, please follow these steps: + + $ zypper in kernel-64kb + [ reboot into the new kernel ] + $ zypper rm kernel-default + + You will then be on the 64kb PAGE_SIZE kernel and can update your + system normally. + EOF + + exit 1 +fi diff --git a/preun.sh b/preun.sh new file mode 100644 index 00000000..473a0f4c diff --git a/series.conf b/series.conf index ab7cb26c..8131950c 100644 --- a/series.conf +++ b/series.conf @@ -842,280 +842,6 @@ patches.kernel.org/5.14.6-430-drm-panfrost-Clamp-lock-region-to-Bifrost-mini.patch patches.kernel.org/5.14.6-431-tracing-osnoise-Fix-missed-cpus_read_unlock-in.patch patches.kernel.org/5.14.6-432-Linux-5.14.6.patch - patches.kernel.org/5.14.7-001-net-stmmac-fix-MAC-not-working-when-system-res.patch - patches.kernel.org/5.14.7-002-io_uring-ensure-symmetry-in-handling-iter-type.patch - patches.kernel.org/5.14.7-003-swiotlb-xen-avoid-double-free.patch - patches.kernel.org/5.14.7-004-swiotlb-xen-fix-late-init-retry.patch - patches.kernel.org/5.14.7-005-xen-reset-legacy-rtc-flag-for-PV-domU.patch - patches.kernel.org/5.14.7-006-xen-fix-usage-of-pmd_populate-in-mremap-for-pv.patch - patches.kernel.org/5.14.7-007-bnx2x-Fix-enabling-network-interfaces-without-.patch - patches.kernel.org/5.14.7-008-arm64-sve-Use-correct-size-when-reinitialising.patch - patches.kernel.org/5.14.7-009-PM-base-power-don-t-try-to-use-non-existing-RT.patch - patches.kernel.org/5.14.7-010-PCI-Add-AMD-GPU-multi-function-power-dependenc.patch - patches.kernel.org/5.14.7-011-drm-amd-display-Get-backlight-from-PWM-if-DMCU.patch - patches.kernel.org/5.14.7-012-drm-amd-display-dsc-mst-2-4K-displays-go-dark-.patch - patches.kernel.org/5.14.7-013-drm-amd-display-Fix-white-screen-page-fault-fo.patch - patches.kernel.org/5.14.7-014-drm-amd-pm-fix-runpm-hang-when-amdgpu-loaded-p.patch - patches.kernel.org/5.14.7-015-drm-amd-amdgpu-Increase-HWIP_MAX_INSTANCE-to-1.patch - patches.kernel.org/5.14.7-016-drm-amdgpu-use-IS_ERR-for-debugfs-APIs.patch - patches.kernel.org/5.14.7-017-drm-amdgpu-fix-use-after-free-during-BO-move.patch - patches.kernel.org/5.14.7-018-drm-amdgpu-add-amdgpu_amdkfd_resume_iommu.patch - patches.kernel.org/5.14.7-019-drm-amdgpu-move-iommu_resume-before-ip-init-re.patch - patches.kernel.org/5.14.7-020-drm-amd-pm-fix-the-issue-of-uploading-powerpla.patch - patches.kernel.org/5.14.7-021-drm-amdkfd-separate-kfd_iommu_resume-from-kfd_.patch - patches.kernel.org/5.14.7-022-drm-radeon-pass-drm-dev-radeon_agp_head_init-d.patch - patches.kernel.org/5.14.7-023-io_uring-allow-retry-for-O_NONBLOCK-if-async-i.patch - patches.kernel.org/5.14.7-024-drm-i915-dp-Use-max-params-for-panels-eDP-1.4.patch - patches.kernel.org/5.14.7-025-drm-etnaviv-return-context-from-etnaviv_iommu_.patch - patches.kernel.org/5.14.7-026-drm-etnaviv-put-submit-prev-MMU-context-when-i.patch - patches.kernel.org/5.14.7-027-drm-etnaviv-stop-abusing-mmu_context-as-FE-run.patch - patches.kernel.org/5.14.7-028-drm-etnaviv-keep-MMU-context-across-runtime-su.patch - patches.kernel.org/5.14.7-029-drm-etnaviv-exec-and-MMU-state-is-lost-when-re.patch - patches.kernel.org/5.14.7-030-drm-etnaviv-fix-MMU-context-leak-on-GPU-reset.patch - patches.kernel.org/5.14.7-031-drm-etnaviv-reference-MMU-context-when-setting.patch - patches.kernel.org/5.14.7-032-drm-etnaviv-add-missing-MMU-context-put-when-r.patch - patches.kernel.org/5.14.7-033-s390-sclp-fix-Secure-IPL-facility-detection.patch - patches.kernel.org/5.14.7-034-net-qrtr-revert-check-in-qrtr_endpoint_post.patch - patches.kernel.org/5.14.7-035-x86-pat-Pass-valid-address-to-sanitize_phys.patch - patches.kernel.org/5.14.7-036-x86-mm-Fix-kern_addr_valid-to-cope-with-existi.patch - patches.kernel.org/5.14.7-037-x86-mce-Avoid-infinite-loop-for-copy-from-user.patch - patches.kernel.org/5.14.7-038-tipc-fix-an-use-after-free-issue-in-tipc_recvm.patch - patches.kernel.org/5.14.7-039-ethtool-Fix-rxnfc-copy-to-user-buffer-overflow.patch - patches.kernel.org/5.14.7-040-net-remove-the-unnecessary-check-in-cipso_v4_d.patch - patches.kernel.org/5.14.7-041-net-mlx5-nfp-bnxt-Remove-unnecessary-RTNL-lock.patch - patches.kernel.org/5.14.7-042-net-caif-avoid-user-triggerable-WARN_ON-1.patch - patches.kernel.org/5.14.7-043-ptp-dp83640-don-t-define-PAGE0.patch - patches.kernel.org/5.14.7-044-dccp-don-t-duplicate-ccid-when-cloning-dccp-so.patch - patches.kernel.org/5.14.7-045-net-l2tp-Fix-reference-count-leak-in-l2tp_udp_.patch - patches.kernel.org/5.14.7-046-r6040-Restore-MDIO-clock-frequency-after-MAC-r.patch - patches.kernel.org/5.14.7-047-tipc-increase-timeout-in-tipc_sk_enqueue.patch - patches.kernel.org/5.14.7-048-drm-rockchip-cdn-dp-core-Make-cdn_dp_core_resu.patch - patches.kernel.org/5.14.7-049-rtc-cmos-Disable-irq-around-direct-invocation-.patch - patches.kernel.org/5.14.7-050-drm-i915-dp-return-proper-DPRX-link-training-r.patch - patches.kernel.org/5.14.7-051-perf-machine-Initialize-srcline-string-member-.patch - patches.kernel.org/5.14.7-052-net-mlx5-FWTrace-cancel-work-on-alloc-pd-error.patch - patches.kernel.org/5.14.7-053-net-mlx5-Fix-potential-sleeping-in-atomic-cont.patch - patches.kernel.org/5.14.7-054-net-stmmac-fix-system-hang-caused-by-eee_ctrl_.patch - patches.kernel.org/5.14.7-055-igc-fix-tunnel-offloading.patch - patches.kernel.org/5.14.7-056-nvme-tcp-fix-io_work-priority-inversion.patch - patches.kernel.org/5.14.7-057-powerpc-64s-system-call-scv-tabort-fix-for-cor.patch - patches.kernel.org/5.14.7-058-events-Reuse-value-read-using-READ_ONCE-instea.patch - patches.kernel.org/5.14.7-059-net-ipa-initialize-all-filter-table-slots.patch - patches.kernel.org/5.14.7-060-gen_compile_commands-fix-missing-sys-package.patch - patches.kernel.org/5.14.7-061-vhost_net-fix-OoB-on-sendmsg-failure.patch - patches.kernel.org/5.14.7-062-net-af_unix-fix-a-data-race-in-unix_dgram_poll.patch - patches.kernel.org/5.14.7-063-net-dsa-destroy-the-phylink-instance-on-any-er.patch - patches.kernel.org/5.14.7-064-x86-uaccess-Fix-32-bit-__get_user_asm_u64-when.patch - patches.kernel.org/5.14.7-065-tcp-fix-tp-undo_retrans-accounting-in-tcp_sack.patch - patches.kernel.org/5.14.7-066-selftest-net-fix-typo-in-altname-test.patch - patches.kernel.org/5.14.7-067-qed-Handle-management-FW-error.patch - patches.kernel.org/5.14.7-068-udp_tunnel-Fix-udp_tunnel_nic-work-queue-type.patch - patches.kernel.org/5.14.7-069-dt-bindings-arm-Fix-Toradex-compatible-typo.patch - patches.kernel.org/5.14.7-070-ibmvnic-check-failover_pending-in-login-respon.patch - patches.kernel.org/5.14.7-071-KVM-PPC-Book3S-HV-Tolerate-treclaim.-in-fake-s.patch - patches.kernel.org/5.14.7-072-powerpc-64s-system-call-rfscv-workaround-for-T.patch - patches.kernel.org/5.14.7-073-powerpc-mce-Fix-access-error-in-mce-handler.patch - patches.kernel.org/5.14.7-074-s390-pci_mmio-fully-validate-the-VMA-before-ca.patch - patches.kernel.org/5.14.7-075-bnxt_en-make-bnxt_free_skbs-safe-to-call-after.patch - patches.kernel.org/5.14.7-076-net-hns3-pad-the-short-tunnel-frame-before-sen.patch - patches.kernel.org/5.14.7-077-net-hns3-change-affinity_mask-to-numa-node-ran.patch - patches.kernel.org/5.14.7-078-net-hns3-disable-mac-in-flr-process.patch - patches.kernel.org/5.14.7-079-net-hns3-fix-the-timing-issue-of-VF-clearing-i.patch - patches.kernel.org/5.14.7-080-net-stmmac-platform-fix-build-warning-when-wit.patch - patches.kernel.org/5.14.7-081-Drivers-hv-vmbus-Fix-kernel-crash-upon-unbindi.patch - patches.kernel.org/5.14.7-082-net-mlx5e-Fix-mutual-exclusion-between-CQE-com.patch - patches.kernel.org/5.14.7-083-ice-Correctly-deal-with-PFs-that-do-not-suppor.patch - patches.kernel.org/5.14.7-084-net-dsa-qca8k-fix-kernel-panic-with-legacy-mdi.patch - patches.kernel.org/5.14.7-085-net-dsa-lantiq_gswip-Add-200ms-assert-delay.patch - patches.kernel.org/5.14.7-086-net-hns3-fix-the-exception-when-query-imp-info.patch - patches.kernel.org/5.14.7-087-nvme-avoid-race-in-shutdown-namespace-removal.patch - patches.kernel.org/5.14.7-088-blkcg-fix-memory-leak-in-blk_iolatency_init.patch - patches.kernel.org/5.14.7-089-net-dsa-flush-switchdev-workqueue-before-teari.patch - patches.kernel.org/5.14.7-090-mlxbf_gige-clear-valid_polarity-upon-open.patch - patches.kernel.org/5.14.7-091-dt-bindings-mtd-gpmc-Fix-the-ECC-bytes-vs.-OOB.patch - patches.kernel.org/5.14.7-092-remoteproc-qcom-wcnss-Fix-race-with-iris-probe.patch - patches.kernel.org/5.14.7-093-mfd-db8500-prcmu-Adjust-map-to-reality.patch - patches.kernel.org/5.14.7-094-PCI-Add-ACS-quirks-for-NXP-LX2xx0-and-LX2xx2-p.patch - patches.kernel.org/5.14.7-095-fuse-fix-use-after-free-in-fuse_read_interrupt.patch - patches.kernel.org/5.14.7-096-PCI-tegra194-Fix-handling-BME_CHGED-event.patch - patches.kernel.org/5.14.7-097-PCI-tegra194-Fix-MSI-X-programming.patch - patches.kernel.org/5.14.7-098-PCI-tegra-Fix-OF-node-reference-leak.patch - patches.kernel.org/5.14.7-099-mfd-Don-t-use-irq_create_mapping-to-resolve-a-.patch - patches.kernel.org/5.14.7-100-PCI-rcar-Fix-runtime-PM-imbalance-in-rcar_pcie.patch - patches.kernel.org/5.14.7-101-riscv-fix-the-global-name-pfn_base-confliction.patch - patches.kernel.org/5.14.7-102-KVM-arm64-Make-hyp_panic-more-robust-when-prot.patch - patches.kernel.org/5.14.7-103-tracing-probes-Reject-events-which-have-the-sa.patch - patches.kernel.org/5.14.7-104-PCI-cadence-Use-bitfield-for-quirk_retrain_fla.patch - patches.kernel.org/5.14.7-105-PCI-cadence-Add-quirk-flag-to-set-minimum-dela.patch - patches.kernel.org/5.14.7-106-PCI-j721e-Add-PCIe-support-for-J7200.patch - patches.kernel.org/5.14.7-107-PCI-j721e-Add-PCIe-support-for-AM64.patch - patches.kernel.org/5.14.7-108-PCI-Add-ACS-quirks-for-Cavium-multi-function-d.patch - patches.kernel.org/5.14.7-109-watchdog-Start-watchdog-in-watchdog_set_last_h.patch - patches.kernel.org/5.14.7-110-octeontx2-af-Add-additional-register-check-to-.patch - patches.kernel.org/5.14.7-111-Set-fc_nlinfo-in-nh_create_ipv4-nh_create_ipv6.patch - patches.kernel.org/5.14.7-112-flow-fix-object-size-mismatch-warning-in-flowi.patch - patches.kernel.org/5.14.7-113-net-usb-cdc_mbim-avoid-altsetting-toggling-for.patch - patches.kernel.org/5.14.7-114-block-bfq-honor-already-setup-queue-merges.patch - patches.kernel.org/5.14.7-115-PCI-ibmphp-Fix-double-unmap-of-io_mem.patch - patches.kernel.org/5.14.7-116-loop-reduce-the-loop_ctl_mutex-scope.patch - patches.kernel.org/5.14.7-117-ethtool-Fix-an-error-code-in-cxgb2.c.patch - patches.kernel.org/5.14.7-118-NTB-Fix-an-error-code-in-ntb_msit_probe.patch - patches.kernel.org/5.14.7-119-NTB-perf-Fix-an-error-code-in-perf_setup_inbuf.patch - patches.kernel.org/5.14.7-120-stmmac-dwmac-loongson-Fix-missing-return-value.patch - patches.kernel.org/5.14.7-121-net-phylink-add-suspend-resume-support.patch - patches.kernel.org/5.14.7-122-mfd-axp20x-Update-AXP288-volatile-ranges.patch - patches.kernel.org/5.14.7-123-backlight-ktd253-Stabilize-backlight.patch - patches.kernel.org/5.14.7-124-PCI-controller-PCI_IXP4XX-should-depend-on-ARC.patch - patches.kernel.org/5.14.7-125-PCI-of-Don-t-fail-devm_pci_alloc_host_bridge-o.patch - patches.kernel.org/5.14.7-126-PCI-iproc-Fix-BCMA-probe-resource-handling.patch - patches.kernel.org/5.14.7-127-netfilter-nft_ct-protect-nft_ct_pcpu_template_.patch - patches.kernel.org/5.14.7-128-KVM-arm64-Restrict-IPA-size-to-maximum-48-bits.patch - patches.kernel.org/5.14.7-129-PCI-Fix-pci_dev_str_match_path-alloc-while-ato.patch - patches.kernel.org/5.14.7-130-mfd-tqmx86-Clear-GPIO-IRQ-resource-when-no-IRQ.patch - patches.kernel.org/5.14.7-131-tracing-boot-Fix-a-hist-trigger-dependency-for.patch - patches.kernel.org/5.14.7-132-mtd-mtdconcat-Judge-callback-existence-based-o.patch - patches.kernel.org/5.14.7-133-mtd-mtdconcat-Check-_read-_write-callbacks-exi.patch - patches.kernel.org/5.14.7-134-KVM-arm64-Fix-read-side-race-on-updates-to-vcp.patch - patches.kernel.org/5.14.7-135-KVM-arm64-Handle-PSCI-resets-before-userspace-.patch - patches.kernel.org/5.14.7-136-PCI-PTM-Remove-error-message-at-boot.patch - patches.kernel.org/5.14.7-137-PCI-Sync-__pci_register_driver-stub-for-CONFIG.patch - patches.kernel.org/5.14.7-138-watchdog-Fix-NULL-pointer-dereference-when-rel.patch - patches.kernel.org/5.14.7-139-mtd-rawnand-cafe-Fix-a-resource-leak-in-the-er.patch - patches.kernel.org/5.14.7-140-ARC-export-clear_user_page-for-modules.patch - patches.kernel.org/5.14.7-141-perf-config-Fix-caching-and-memory-leak-in-per.patch - patches.kernel.org/5.14.7-142-perf-unwind-Do-not-overwrite-FEATURE_CHECK_LDF.patch - patches.kernel.org/5.14.7-143-perf-bench-inject-buildid-Handle-writen-errors.patch - patches.kernel.org/5.14.7-144-gpio-mpc8xxx-Fix-a-resources-leak-in-the-error.patch - patches.kernel.org/5.14.7-145-gpio-mpc8xxx-Fix-a-potential-double-iounmap-ca.patch - patches.kernel.org/5.14.7-146-gpio-mpc8xxx-Use-devm_gpiochip_add_data-to-sim.patch - patches.kernel.org/5.14.7-147-io_uring-retry-in-case-of-short-read-on-block-.patch - patches.kernel.org/5.14.7-148-net-dsa-tag_rtl4_a-Fix-egress-tags.patch - patches.kernel.org/5.14.7-149-tools-build-Fix-feature-detect-clean-for-out-o.patch - patches.kernel.org/5.14.7-150-mptcp-fix-possible-divide-by-zero.patch - patches.kernel.org/5.14.7-151-selftests-mptcp-clean-tmp-files-in-simult_flow.patch - patches.kernel.org/5.14.7-152-net-hso-add-failure-handler-for-add_net_device.patch - patches.kernel.org/5.14.7-153-net-dsa-b53-Fix-calculating-number-of-switch-p.patch - patches.kernel.org/5.14.7-154-net-dsa-b53-Set-correct-number-of-ports-in-the.patch - patches.kernel.org/5.14.7-155-mptcp-Only-send-extra-TCP-acks-in-eligible-soc.patch - patches.kernel.org/5.14.7-156-netfilter-socket-icmp6-fix-use-after-scope.patch - patches.kernel.org/5.14.7-157-fq_codel-reject-silly-quantum-parameters.patch - patches.kernel.org/5.14.7-158-qlcnic-Remove-redundant-unlock-in-qlcnic_pinit.patch - patches.kernel.org/5.14.7-159-iwlwifi-move-get-pnvm-file-name-to-a-separate-.patch - patches.kernel.org/5.14.7-160-iwlwifi-pnvm-Fix-a-memory-leak-in-iwl_pnvm_get.patch - patches.kernel.org/5.14.7-161-ip_gre-validate-csum_start-only-on-pull.patch - patches.kernel.org/5.14.7-162-net-dsa-b53-Fix-IMP-port-setup-on-BCM5301x.patch - patches.kernel.org/5.14.7-163-bnxt_en-fix-stored-FW_PSID-version-masks.patch - patches.kernel.org/5.14.7-164-bnxt_en-Fix-asic.rev-in-devlink-dev-info-comma.patch - patches.kernel.org/5.14.7-165-bnxt_en-Fix-possible-unintended-driver-initiat.patch - patches.kernel.org/5.14.7-166-ip6_gre-Revert-ip6_gre-add-validation-for-csum.patch - patches.kernel.org/5.14.7-167-mfd-lpc_sch-Rename-GPIOBASE-to-prevent-build-e.patch - patches.kernel.org/5.14.7-168-cxgb3-fix-oops-on-module-removal.patch - patches.kernel.org/5.14.7-169-net-renesas-sh_eth-Fix-freeing-wrong-tx-descri.patch - patches.kernel.org/5.14.7-170-bnxt_en-Fix-error-recovery-regression.patch - patches.kernel.org/5.14.7-171-net-dsa-bcm_sf2-Fix-array-overrun-in-bcm_sf2_n.patch - patches.kernel.org/5.14.7-172-s390-bpf-Fix-optimizing-out-zero-extensions.patch - patches.kernel.org/5.14.7-173-s390-bpf-Fix-64-bit-subtraction-of-the-0x80000.patch - patches.kernel.org/5.14.7-174-s390-bpf-Fix-branch-shortening-during-codegen-.patch - patches.kernel.org/5.14.7-175-Linux-5.14.7.patch - patches.kernel.org/5.14.8-001-PCI-pci-bridge-emul-Add-PCIe-Root-Capabilities.patch - patches.kernel.org/5.14.8-002-PCI-aardvark-Fix-reporting-CRS-value.patch - patches.kernel.org/5.14.8-003-console-consume-APC-DM-DCS.patch - patches.kernel.org/5.14.8-004-staging-rtl8192u-Fix-bitwise-vs-logical-operat.patch - patches.kernel.org/5.14.8-005-um-fix-stub-location-calculation.patch - patches.kernel.org/5.14.8-006-coredump-fix-memleak-in-dump_vma_snapshot.patch - patches.kernel.org/5.14.8-007-um-virtio_uml-fix-memory-leak-on-init-failures.patch - patches.kernel.org/5.14.8-008-RDMA-hns-Enable-stash-feature-of-HIP09.patch - patches.kernel.org/5.14.8-009-RDMA-mlx5-Fix-xlt_chunk_align-calculation.patch - patches.kernel.org/5.14.8-010-dmaengine-acpi-Avoid-comparison-GSI-with-Linux.patch - patches.kernel.org/5.14.8-011-perf-test-Fix-bpf-test-sample-mismatch-reporti.patch - patches.kernel.org/5.14.8-012-perf-symbol-Look-for-ImageBase-in-PE-file-to-c.patch - patches.kernel.org/5.14.8-013-perf-tools-Allow-build-id-with-trailing-zeros.patch - patches.kernel.org/5.14.8-014-staging-rtl8723bs-fix-wpa_set_auth_algs-functi.patch - patches.kernel.org/5.14.8-015-n64cart-fix-return-value-check-in-n64cart_prob.patch - patches.kernel.org/5.14.8-016-thermal-drivers-exynos-Fix-an-error-code-in-ex.patch - patches.kernel.org/5.14.8-017-9p-trans_virtio-Remove-sysfs-file-on-probe-fai.patch - patches.kernel.org/5.14.8-018-pwm-ab8500-Fix-register-offset-calculation-to-.patch - patches.kernel.org/5.14.8-019-prctl-allow-to-setup-brk-for-et_dyn-executable.patch - patches.kernel.org/5.14.8-020-nilfs2-use-refcount_dec_and_lock-to-fix-potent.patch - patches.kernel.org/5.14.8-021-profiling-fix-shift-out-of-bounds-bugs.patch - patches.kernel.org/5.14.8-022-PM-sleep-core-Avoid-setting-power.must_resume-.patch - patches.kernel.org/5.14.8-023-thermal-drivers-qcom-spmi-adc-tm5-Don-t-abort-.patch - patches.kernel.org/5.14.8-024-ceph-cancel-delayed-work-instead-of-flushing-o.patch - patches.kernel.org/5.14.8-025-pwm-lpc32xx-Don-t-modify-HW-state-in-.probe-af.patch - patches.kernel.org/5.14.8-026-pwm-mxs-Don-t-modify-HW-state-in-.probe-after-.patch - patches.kernel.org/5.14.8-027-dmanegine-idxd-cleanup-all-device-related-bits.patch - patches.kernel.org/5.14.8-028-dmaengine-idxd-have-command-status-always-set.patch - patches.kernel.org/5.14.8-029-dmaengine-idxd-fix-wq-slot-allocation-index-ch.patch - patches.kernel.org/5.14.8-030-dmaengine-idxd-fix-abort-status-check.patch - patches.kernel.org/5.14.8-031-dmaengine-idxd-clear-block-on-fault-flag-when-.patch - patches.kernel.org/5.14.8-032-platform-chrome-sensorhub-Add-trace-events-for.patch - patches.kernel.org/5.14.8-033-platform-chrome-cros_ec_trace-Fix-format-warni.patch - patches.kernel.org/5.14.8-034-s390-entry-make-oklabel-within-CHKSTG-macro-lo.patch - patches.kernel.org/5.14.8-035-SUNRPC-don-t-pause-on-incomplete-allocation.patch - patches.kernel.org/5.14.8-036-math-RATIONAL_KUNIT_TEST-should-depend-on-RATI.patch - patches.kernel.org/5.14.8-037-init-move-usermodehelper_enable-to-populate_ro.patch - patches.kernel.org/5.14.8-038-Kconfig.debug-drop-selecting-non-existing-HARD.patch - patches.kernel.org/5.14.8-039-tools-bootconfig-Fix-tracing_on-option-checkin.patch - patches.kernel.org/5.14.8-040-tracing-boot-Fix-to-loop-on-only-subkeys.patch - patches.kernel.org/5.14.8-041-thermal-core-Fix-thermal_cooling_device_regist.patch - patches.kernel.org/5.14.8-042-drm-amdgpu-Disable-PCIE_DPM-on-Intel-RKL-Platf.patch - patches.kernel.org/5.14.8-043-drivers-base-cacheinfo-Get-rid-of-DEFINE_SMP_C.patch - patches.kernel.org/5.14.8-044-dma-buf-DMABUF_MOVE_NOTIFY-should-depend-on-DM.patch - patches.kernel.org/5.14.8-045-dma-buf-DMABUF_DEBUG-should-depend-on-DMA_SHAR.patch - patches.kernel.org/5.14.8-046-parisc-Move-pci_dev_is_behind_card_dino-to-whe.patch - patches.kernel.org/5.14.8-047-iommu-amd-Relocate-GAMSup-check-to-early_enabl.patch - patches.kernel.org/5.14.8-048-iommu-vt-d-Fix-PASID-leak-in-intel_svm_unbind_.patch - patches.kernel.org/5.14.8-049-iommu-vt-d-Fix-a-deadlock-in-intel_svm_drain_p.patch - patches.kernel.org/5.14.8-050-arm64-mm-limit-linear-region-to-51-bits-for-KV.patch - patches.kernel.org/5.14.8-051-drm-ttm-Fix-a-deadlock-if-the-target-BO-is-not.patch - patches.kernel.org/5.14.8-052-of-property-Disable-fw_devlink-DT-support-for-.patch - patches.kernel.org/5.14.8-053-riscv-dts-microchip-mpfs-icicle-Fix-serial-con.patch - patches.kernel.org/5.14.8-054-dmaengine-idxd-depends-on-UML.patch - patches.kernel.org/5.14.8-055-dmaengine-sprd-Add-missing-MODULE_DEVICE_TABLE.patch - patches.kernel.org/5.14.8-056-cxl-Move-cxl_core-to-new-directory.patch - patches.kernel.org/5.14.8-057-cxl-pci-Introduce-cdevm_file_operations.patch - patches.kernel.org/5.14.8-058-dmaengine-ioat-depends-on-UML.patch - patches.kernel.org/5.14.8-059-dmaengine-xilinx_dma-Set-DMA-mask-for-coherent.patch - patches.kernel.org/5.14.8-060-s390-add-kmemleak-annotation-in-stack_alloc.patch - patches.kernel.org/5.14.8-061-ASoC-audio-graph-respawn-Platform-Support.patch - patches.kernel.org/5.14.8-062-ACPI-PM-s2idle-Run-both-AMD-and-Microsoft-meth.patch - patches.kernel.org/5.14.8-063-ceph-fix-memory-leak-on-decode-error-in-ceph_h.patch - patches.kernel.org/5.14.8-064-ceph-request-Fw-caps-before-updating-the-mtime.patch - patches.kernel.org/5.14.8-065-ceph-remove-the-capsnaps-when-removing-caps.patch - patches.kernel.org/5.14.8-066-ceph-lockdep-annotations-for-try_nonblocking_i.patch - patches.kernel.org/5.14.8-067-s390-unwind-use-current_frame_address-to-unwin.patch - patches.kernel.org/5.14.8-068-btrfs-update-the-bdev-time-directly-when-closi.patch - patches.kernel.org/5.14.8-069-btrfs-delay-blkdev_put-until-after-the-device-.patch - patches.kernel.org/5.14.8-070-btrfs-fix-lockdep-warning-while-mounting-sprou.patch - patches.kernel.org/5.14.8-071-nilfs2-fix-memory-leak-in-nilfs_sysfs_create_d.patch - patches.kernel.org/5.14.8-072-nilfs2-fix-NULL-pointer-in-nilfs_-name-_attr_r.patch - patches.kernel.org/5.14.8-073-nilfs2-fix-memory-leak-in-nilfs_sysfs_create_-.patch - patches.kernel.org/5.14.8-074-nilfs2-fix-memory-leak-in-nilfs_sysfs_delete_-.patch - patches.kernel.org/5.14.8-075-nilfs2-fix-memory-leak-in-nilfs_sysfs_create_s.patch - patches.kernel.org/5.14.8-076-nilfs2-fix-memory-leak-in-nilfs_sysfs_delete_s.patch - patches.kernel.org/5.14.8-077-thermal-drivers-rcar_gen3_thermal-Store-TSC-id.patch - patches.kernel.org/5.14.8-078-habanalabs-fix-nullifying-of-destroyed-mmu-pgt.patch - patches.kernel.org/5.14.8-079-drm-amdgpu-Fixes-to-returning-VBIOS-RAS-EEPROM.patch - patches.kernel.org/5.14.8-080-drm-amd-display-Fix-memory-leak-reported-by-co.patch - patches.kernel.org/5.14.8-081-drm-amdgpu-fix-fdinfo-race-with-process-exit.patch - patches.kernel.org/5.14.8-082-habanalabs-add-validity-check-for-event-ID-rec.patch - patches.kernel.org/5.14.8-083-habanalabs-fix-mmu-node-address-resolution-in-.patch - patches.kernel.org/5.14.8-084-habanalabs-add-in-device-creation-status.patch - patches.kernel.org/5.14.8-085-habanalabs-cannot-sleep-while-holding-spinlock.patch - patches.kernel.org/5.14.8-086-pwm-img-Don-t-modify-HW-state-in-.remove-callb.patch - patches.kernel.org/5.14.8-087-pwm-rockchip-Don-t-modify-HW-state-in-.remove-.patch - patches.kernel.org/5.14.8-088-pwm-stm32-lp-Don-t-modify-HW-state-in-.remove-.patch - patches.kernel.org/5.14.8-089-nvmet-fixup-buffer-overrun-in-nvmet_subsys_att.patch - patches.kernel.org/5.14.8-090-block-genhd-don-t-call-blkdev_show-with-major_.patch - patches.kernel.org/5.14.8-091-blk-throttle-fix-UAF-by-deleteing-timer-in-blk.patch - patches.kernel.org/5.14.8-092-blk-mq-allow-4x-BLK_MAX_REQUEST_COUNT-at-blk_p.patch - patches.kernel.org/5.14.8-093-rtc-rx8010-select-REGMAP_I2C.patch - patches.kernel.org/5.14.8-094-sched-idle-Make-the-idle-timer-expire-in-hard-.patch - patches.kernel.org/5.14.8-095-cifs-properly-invalidate-cached-root-handle-wh.patch - patches.kernel.org/5.14.8-096-io_uring-fix-off-by-one-in-BUILD_BUG_ON-check-.patch - patches.kernel.org/5.14.8-097-selinux-smack-fix-subjective-objective-credent.patch - patches.kernel.org/5.14.8-098-drm-nouveau-nvkm-Replace-ENOSYS-with-ENODEV.patch - patches.kernel.org/5.14.8-099-Linux-5.14.8.patch ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -1144,11 +870,13 @@ patches.suse/Bluetooth-btusb-Add-support-for-Foxconn-Mediatek-Chi.patch patches.suse/Bluetooth-switch-to-lock_sock-in-SCO.patch patches.suse/Bluetooth-sco-Fix-lock_sock-blockage-by-memcpy_from_.patch + patches.suse/watchdog-Fix-NULL-pointer-dereference-when-releasing.patch patches.suse/memcg-enable-accounting-of-ipc-resources.patch patches.suse/crypto_ccp-fix_resource_leaks_in_ccp_run_aes_gcm_cmd.patch patches.suse/drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch + patches.suse/ethtool-Fix-rxnfc-copy-to-user-buffer-overflow.patch + patches.suse/tipc-fix-an-use-after-free-issue-in-tipc_recvmsg.patch patches.suse/Revert-usb-xhci-mtk-Do-not-use-xhci-s-virt_dev-in-dr.patch - patches.suse/nvmet-fix-a-width-vs-precision-bug-in-nvmet_subsys_a.patch ######################################################## # kbuild/module infrastructure fixes diff --git a/source-timestamp b/source-timestamp index ee91bb2e..514969c9 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2021-09-27 06:35:53 +0000 -GIT Revision: 06dbf6bb31e9333fa8908900183e13ca4d39c0fa +2021-09-30 02:53:41 +0000 +GIT Revision: 4ae263c462a0821a92b81bcc659288f35a430bca GIT Branch: stable