From 669d0bdff7a23876eac11604261370ddb4b610378f5a209bae53e4235bfb1bb2 Mon Sep 17 00:00:00 2001 From: Kernel Bugs Date: Wed, 2 Dec 2020 08:08:02 +0000 Subject: [PATCH] commit afd1f81611e1d75a2733d5ad6c4af2f03161e904 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1402 --- config.tar.bz2 | 4 ++-- dtb-aarch64.changes | 28 ---------------------------- dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 28 ---------------------------- dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 28 ---------------------------- dtb-armv7l.spec | 2 +- dtb-riscv64.changes | 28 ---------------------------- dtb-riscv64.spec | 2 +- kernel-64kb.changes | 28 ---------------------------- kernel-64kb.spec | 15 +++++++++------ kernel-binary.spec.in | 7 +++++-- kernel-debug.changes | 28 ---------------------------- kernel-debug.spec | 15 +++++++++------ kernel-default.changes | 28 ---------------------------- kernel-default.spec | 15 +++++++++------ kernel-docs.changes | 28 ---------------------------- kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 28 ---------------------------- kernel-kvmsmall.spec | 15 +++++++++------ kernel-lpae.changes | 28 ---------------------------- kernel-lpae.spec | 15 +++++++++------ kernel-obs-build.changes | 28 ---------------------------- kernel-obs-build.spec | 4 ++-- kernel-obs-qa.changes | 28 ---------------------------- kernel-obs-qa.spec | 2 +- kernel-pae.changes | 28 ---------------------------- kernel-pae.spec | 15 +++++++++------ kernel-source.changes | 28 ---------------------------- kernel-source.spec | 6 ++++-- kernel-source.spec.in | 2 ++ kernel-syms.changes | 28 ---------------------------- kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 28 ---------------------------- kernel-vanilla.spec | 15 +++++++++------ kernel-zfcpdump.changes | 28 ---------------------------- kernel-zfcpdump.spec | 15 +++++++++------ source-timestamp | 4 ++-- 38 files changed, 98 insertions(+), 543 deletions(-) diff --git a/config.tar.bz2 b/config.tar.bz2 index b5e1feca..c7e120dd 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c89b769078dc4e743ff17a6ace97b961401492763ca1240cd4dadc44306d2116 -size 276580 +oid sha256:017444c6ef4c720dfe29969a190b0168672f7dc4eaf96f494605b12ebd2aab49 +size 276660 diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 053a40bf..d60b0965 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 58af6e19..d3b2a68a 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 053a40bf..d60b0965 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index 8ba015b1..3a552238 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 053a40bf..d60b0965 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index a785c437..b3bbe270 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif diff --git a/dtb-riscv64.changes b/dtb-riscv64.changes index 053a40bf..d60b0965 100644 --- a/dtb-riscv64.changes +++ b/dtb-riscv64.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/dtb-riscv64.spec b/dtb-riscv64.spec index a3c995ee..e8119e90 100644 --- a/dtb-riscv64.spec +++ b/dtb-riscv64.spec @@ -31,7 +31,7 @@ Name: dtb-riscv64 Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 053a40bf..d60b0965 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 3908afd4..35587762 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -70,7 +70,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 -Provides: kernel-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: kernel-%build_flavor-base-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 +Provides: kernel-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 # END COMMON DEPS -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -454,7 +454,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -759,6 +759,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -792,6 +794,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 9b0206b8..b74bb165 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -309,7 +309,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -614,6 +614,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -647,6 +649,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/kernel-debug.changes b/kernel-debug.changes index 053a40bf..d60b0965 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index ff7f2e21..fcb64b71 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -70,7 +70,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 -Provides: kernel-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: kernel-%build_flavor-base-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 +Provides: kernel-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 # END COMMON DEPS -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -460,7 +460,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -765,6 +765,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -798,6 +800,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/kernel-default.changes b/kernel-default.changes index 053a40bf..d60b0965 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index 5c03540e..f071719d 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -70,7 +70,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 -Provides: kernel-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: kernel-%build_flavor-base-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 +Provides: kernel-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 # END COMMON DEPS -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -503,7 +503,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -808,6 +808,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -841,6 +843,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/kernel-docs.changes b/kernel-docs.changes index 053a40bf..d60b0965 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index 07fd6778..5710fd4b 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0 Group: Documentation/Man Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -63,7 +63,7 @@ BuildRequires: texlive-zapfding %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 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 053a40bf..d60b0965 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index a32fa6b1..adcbea25 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -70,7 +70,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 -Provides: kernel-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: kernel-%build_flavor-base-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 +Provides: kernel-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 # END COMMON DEPS -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -458,7 +458,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -763,6 +763,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -796,6 +798,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 053a40bf..d60b0965 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 8672196b..707460af 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -70,7 +70,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 -Provides: kernel-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: kernel-%build_flavor-base-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 +Provides: kernel-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 # END COMMON DEPS -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -452,7 +452,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -757,6 +757,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -790,6 +792,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 053a40bf..d60b0965 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index 45e370e7..440887d1 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-99e4d1ff9574b11daafba271e8a25e02e9345761 +BuildRequires: kernel%kernel_flavor-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0 Group: SLES Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 053a40bf..d60b0965 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index b3bfbaf9..679ebbec 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0 Group: SLES Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 053a40bf..d60b0965 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index 780bf6ab..8d54b18d 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -70,7 +70,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 -Provides: kernel-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: kernel-%build_flavor-base-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 +Provides: kernel-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 # END COMMON DEPS -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -480,7 +480,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -785,6 +785,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -818,6 +820,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/kernel-source.changes b/kernel-source.changes index 053a40bf..d60b0965 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index d876e5f6..b13e4231 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -32,7 +32,7 @@ License: GPL-2.0 Group: Development/Sources Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz @@ -224,6 +224,8 @@ cd .. %endif %if ! %vanilla_only +ln -sf XXlinux%variant linux%variant # dummy symlink + cd linux-%kernelrelease%variant %_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") diff --git a/kernel-source.spec.in b/kernel-source.spec.in index b10c1380..567ccbdd 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -224,6 +224,8 @@ cd .. %endif %if ! %vanilla_only +ln -sf XXlinux%variant linux%variant # dummy symlink + cd linux-%kernelrelease%variant %_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") diff --git a/kernel-syms.changes b/kernel-syms.changes index 053a40bf..d60b0965 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index dceaa59c..a5c7a8a6 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 5.9.11 %if %using_buildservice %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %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-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 053a40bf..d60b0965 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index eaa37d42..fb6c51fc 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -70,7 +70,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 -Provides: kernel-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: kernel-%build_flavor-base-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 +Provides: kernel-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 # END COMMON DEPS -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -451,7 +451,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -756,6 +756,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -789,6 +791,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 053a40bf..d60b0965 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 1 12:02:07 CET 2020 - msuchanek@suse.de - -- rpm/kernel-{source,binary}.spec: do not include ghost symlinks - (boo#1179082). -- commit 76a9256 - -------------------------------------------------------------------- -Tue Dec 1 09:43:02 CET 2020 - jslaby@suse.cz - -- Update config files. - Refresh after SOUNDWIRE removal. -- commit fa3b6ea - -------------------------------------------------------------------- -Mon Nov 30 13:58:44 CET 2020 - ohering@suse.de - -- scripts/lib/SUSE/MyBS.pm: properly close prjconf Macros: section -- commit 965157e - ------------------------------------------------------------------- Mon Nov 30 11:39:07 CET 2020 - tiwai@suse.de @@ -508,14 +488,6 @@ Tue Nov 24 08:49:09 CET 2020 - jslaby@suse.cz a bit pointless. So fix this. - commit cc720a5 -------------------------------------------------------------------- -Mon Nov 23 11:32:29 CET 2020 - jslaby@suse.cz - -- rpm/kernel-binary.spec.in: use grep -E instead of egrep (bsc#1179045) - egrep is only a deprecated bash wrapper for "grep -E". So use the latter - instead. -- commit 63d7072 - ------------------------------------------------------------------- Mon Nov 23 10:08:45 CET 2020 - jslaby@suse.cz diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 09b30018..5d7894da 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -40,7 +40,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj -%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) +%if 0%{?_project:1} && ( %(echo %_project | egrep -x -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %define klp_symbols 1 %endif @@ -70,7 +70,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.9.11 %if 0%{?is_kotd} -Release: .g99e4d1f +Release: .gafd1f81 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 -Provides: kernel-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: kernel-%build_flavor-base-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 +Provides: kernel-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 # END COMMON DEPS -Provides: %name-srchash-99e4d1ff9574b11daafba271e8a25e02e9345761 +Provides: %name-srchash-afd1f81611e1d75a2733d5ad6c4af2f03161e904 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -454,7 +454,7 @@ fi CONFIG_SUSE_KERNEL_RELEASED="--disable CONFIG_SUSE_KERNEL_RELEASED" %if 0%{?_project:1} -if echo %_project | grep -Eqx -f %_sourcedir/release-projects; then +if echo %_project | egrep -qx -f %_sourcedir/release-projects; then CONFIG_SUSE_KERNEL_RELEASED="--enable CONFIG_SUSE_KERNEL_RELEASED" fi %endif @@ -759,6 +759,8 @@ done # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif +ln -s XX$image$suffix %buildroot/boot/$image$suffix +ln -s XXinitrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor @@ -792,6 +794,7 @@ chmod 0600 %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch + ln -s XX%build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor install -m 755 -D -t %rpm_install_dir/%cpu_arch_flavor/scripts/mod/ scripts/mod/ksym-provides gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz diff --git a/source-timestamp b/source-timestamp index e5f20f0b..a7fdffa1 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2020-12-02 06:11:58 +0000 -GIT Revision: 99e4d1ff9574b11daafba271e8a25e02e9345761 +2020-11-30 10:39:07 +0000 +GIT Revision: afd1f81611e1d75a2733d5ad6c4af2f03161e904 GIT Branch: stable