pool/kernel-source
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit ef159e42ce3cbb3ce8e84782cf61ac052a2597c5

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1964
This commit is contained in:
Jiri Slaby 2023-07-05 14:33:01 +00:00 committed by Git OBS Bridge
parent bdcd79f30b
commit e4d1697414
40 changed files with 533 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_buildinfo-standard-x86_64.xml
View File

@ -52,6 +52,7 @@
<bdep name="fdupes" version="2.2.1" release="3.104" arch="x86_64" hdrmd5="f6fe55796ec175f8a4255f16c708b427" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="flex" version="2.6.4" release="8.284" arch="x86_64" hdrmd5="17fd1726959458586f20cfd7396c3c00" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="hmaccalc" version="0.9.14" release="3.241" arch="x86_64" hdrmd5="fc4072f2cff3b685565869fd1e5e88c7" project="openSUSE:Factory:Staging:M" repository="standard"/>
<bdep name="jq" version="1.6" release="4.9" arch="x86_64" hdrmd5="177c01d638420a3eb4ed23e881b3efd0" project="openSUSE:Factory:Staging:M" repository="standard"/>
<bdep name="libopenssl-devel" version="3.1.1" release="3.2" arch="noarch" hdrmd5="f41e259e3ef976a05d357262f78251a2" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="openssl" version="3.1.1" release="3.2" arch="noarch" hdrmd5="9e4323b6445a6c1192cc154c0d970ff1" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="pesign-obs-integration" version="10.2+git20230612.4699910" release="4.1" arch="x86_64" hdrmd5="3d428b9ed5a3b65db767f72424ce3cee" project="openSUSE:Factory:Staging:M" repository="standard"/>
@ -68,6 +69,7 @@
<bdep name="libfl-devel" version="2.6.4" release="8.284" arch="x86_64" hdrmd5="fac3fba1ef14d83fb318cf7843e7b4d3" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="mozilla-nss" version="3.89.1" release="4.7" arch="x86_64" hdrmd5="da6051aba6275a3de49d136c34a6ed5e" project="openSUSE:Factory:Staging:M" repository="standard"/>
<bdep name="mozilla-nspr" version="4.35" release="3.13" arch="x86_64" hdrmd5="6e6521f24b56da0d73ffa477bc8590c9" project="openSUSE:Factory:Staging:M" repository="standard"/>
<bdep name="libjq1" version="1.6" release="4.9" arch="x86_64" hdrmd5="efa873472a28d76218b9c80b281af24d" project="openSUSE:Factory:Staging:M" repository="standard"/>
<bdep name="pkgconf-pkg-config" version="1.8.0" release="3.59" arch="x86_64" hdrmd5="0c9729ef5c371683646fe4ee7f0bdb51" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="libopenssl-3-devel" version="3.1.1" release="3.1" arch="x86_64" hdrmd5="5fedbfd4b8e48323ec665375f76d357e" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="libopenssl3" version="3.1.1" release="3.1" arch="x86_64" hdrmd5="229d6ed68b75d3f1a80e294021615e0e" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
@ -104,6 +106,7 @@
<bdep name="libfl2" version="2.6.4" release="8.284" arch="x86_64" hdrmd5="a6c333d0c7eee4225a14d2d756ce5b10" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="libfreebl3" version="3.89.1" release="4.7" arch="x86_64" hdrmd5="28f5bf7cb19a8cc10aeec2d7a32f9d9c" project="openSUSE:Factory:Staging:M" repository="standard"/>
<bdep name="libsoftokn3" version="3.89.1" release="4.7" arch="x86_64" hdrmd5="9eb8a75c5c04d98035d808900a9d0d26" project="openSUSE:Factory:Staging:M" repository="standard"/>
<bdep name="libonig5" version="6.9.8" release="3.20" arch="x86_64" hdrmd5="a9bdb16c3d9e69d13439419bf04bd3a7" project="openSUSE:Factory:Staging:M" repository="standard"/>
<bdep name="pkgconf" version="1.8.0" release="3.59" arch="x86_64" hdrmd5="1ff831ffa29d98412459b48ee1a324a4" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="pkgconf-m4" version="1.8.0" release="3.59" arch="noarch" hdrmd5="f00efa1657e71a0f61c6af2335d06b1c" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>
<bdep name="crypto-policies" version="20230420.3d08ae7" release="2.19" arch="noarch" hdrmd5="005c3fe9efa457c7548e3bf9f367e21e" project="openSUSE:Factory:Staging:M" repository="bootstrap_copy"/>

17
dtb-aarch64.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

2
dtb-aarch64.spec
View File

@ -27,7 +27,7 @@
Name: dtb-aarch64
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif

17
dtb-armv6l.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

2
dtb-armv6l.spec
View File

@ -27,7 +27,7 @@
Name: dtb-armv6l
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif

17
dtb-armv7l.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

2
dtb-armv7l.spec
View File

@ -27,7 +27,7 @@
Name: dtb-armv7l
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif

17
dtb-riscv64.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

2
dtb-riscv64.spec
View File

@ -27,7 +27,7 @@
Name: dtb-riscv64
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif

17
kernel-64kb.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

33
kernel-64kb.spec
View File

@ -114,7 +114,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -242,10 +245,10 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
# END COMMON DEPS
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -503,9 +506,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -707,6 +707,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -1037,6 +1045,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1346,8 +1358,8 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1580,6 +1592,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

21
kernel-binary.spec.in
View File

@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -364,9 +367,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -568,6 +568,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -898,6 +906,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1362,6 +1374,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

17
kernel-debug.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

33
kernel-debug.spec
View File

@ -114,7 +114,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -242,10 +245,10 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
# END COMMON DEPS
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
@ -509,9 +512,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -713,6 +713,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -1043,6 +1051,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1352,8 +1364,8 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%ifarch ppc64
Provides: kernel-kdump-base = 2.6.28
@ -1592,6 +1604,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

17
kernel-default.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

33
kernel-default.spec
View File

@ -114,7 +114,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -242,10 +245,10 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
# END COMMON DEPS
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
@ -552,9 +555,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -756,6 +756,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -1086,6 +1094,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1395,8 +1407,8 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%ifarch %ix86
Provides: kernel-trace-base = 3.13
@ -1692,6 +1704,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

17
kernel-docs.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

4
kernel-docs.spec
View File

@ -32,7 +32,7 @@ License: GPL-2.0-only
Group: Documentation/Man
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -83,7 +83,7 @@ BuildRequires: texlive-zapfding
%endif
URL: https://www.kernel.org/
Provides: %name = %version-%source_rel
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
BuildArch: noarch
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc

17
kernel-kvmsmall.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

33
kernel-kvmsmall.spec
View File

@ -114,7 +114,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -242,10 +245,10 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
# END COMMON DEPS
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -507,9 +510,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -711,6 +711,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -1041,6 +1049,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1350,8 +1362,8 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1596,6 +1608,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

17
kernel-lpae.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

33
kernel-lpae.spec
View File

@ -114,7 +114,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -242,10 +245,10 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
# END COMMON DEPS
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -501,9 +504,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -705,6 +705,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -1035,6 +1043,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1344,8 +1356,8 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1572,6 +1584,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

17
kernel-obs-build.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

4
kernel-obs-build.spec
View File

@ -44,7 +44,7 @@ BuildRequires: util-linux
%endif
%endif
%endif
BuildRequires: kernel%kernel_flavor-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
BuildRequires: kernel%kernel_flavor-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%if 0%{?rhel_version}
BuildRequires: kernel
@ -58,7 +58,7 @@ License: GPL-2.0-only
Group: SLES
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif

17
kernel-obs-qa.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

2
kernel-obs-qa.spec
View File

@ -34,7 +34,7 @@ License: GPL-2.0-only
Group: SLES
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif

17
kernel-pae.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

33
kernel-pae.spec
View File

@ -114,7 +114,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -242,10 +245,10 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
# END COMMON DEPS
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
@ -529,9 +532,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -733,6 +733,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -1063,6 +1071,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1372,8 +1384,8 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%ifarch %ix86
Provides: kernel-vmi-base = 2.6.38
@ -1648,6 +1660,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

17
kernel-source.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

17
kernel-source.spec
View File

@ -32,7 +32,7 @@
Name: kernel-source
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -49,7 +49,7 @@ BuildRequires: fdupes
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: linux
Provides: multiversion(kernel)
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
@ -134,6 +134,9 @@ Recommends: bc
Recommends: bison
Recommends: flex
Recommends: libelf-devel
%if 0%{?suse_version} > 1500
Recommends: jq
%endif
Recommends: openssl-devel
# pahole needed for BTF
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300
@ -226,6 +229,10 @@ find . -xtype l -delete -printf "deleted '%f'\n"
if test "%srcversion" != "%kernelrelease%variant"; then
mv linux-%srcversion linux-%kernelrelease%variant
fi
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%variant/Makefile
%endif
%if %do_vanilla
cp -al \
@ -233,9 +240,6 @@ fi
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..
@ -248,9 +252,6 @@ rm -f $(find . -name ".gitignore")
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..

13
kernel-source.spec.in
View File

@ -134,6 +134,9 @@ Recommends: bc
Recommends: bison
Recommends: flex
Recommends: libelf-devel
%if 0%{?suse_version} > 1500
Recommends: jq
%endif
Recommends: openssl-devel
# pahole needed for BTF
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300
@ -226,6 +229,10 @@ find . -xtype l -delete -printf "deleted '%f'\n"
if test "%srcversion" != "%kernelrelease%variant"; then
mv linux-%srcversion linux-%kernelrelease%variant
fi
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%variant/Makefile
%endif
%if %do_vanilla
cp -al \
@ -233,9 +240,6 @@ fi
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..
@ -248,9 +252,6 @@ rm -f $(find . -name ".gitignore")
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..

12
kernel-spec-macros
View File

@ -83,15 +83,3 @@ else \
fi \
} \
run_if_exists
%define regex_fixup regex_fixup () { \
local expression="$1" ; shift \
sed -i~ -e "$expression" "$@" \
while [ -n "$1" ] ; do \
diff -u "$1"~ "$1" || echo WARNING: "$1" was modified\! \
shift \
done \
} \
regex_fixup
# vim: ft=spec

17
kernel-syms.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

4
kernel-syms.spec
View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 6.4.1
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%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-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel

17
kernel-vanilla.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

33
kernel-vanilla.spec
View File

@ -114,7 +114,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -242,10 +245,10 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
# END COMMON DEPS
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -500,9 +503,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -704,6 +704,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -1034,6 +1042,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1343,8 +1355,8 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1568,6 +1580,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

17
kernel-zfcpdump.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 5 16:16:56 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. There are
build failures with reverted kmod. We will re-apply once kmod is fixed.
- commit ef159e4
-------------------------------------------------------------------
Wed Jul 5 16:16:08 CEST 2023 - jslaby@suse.cz
- Revert "Revert "Refresh patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.""
This reverts commit 3561b10a2dce725e0d2f5692301ad7f0fa461375. Back to
the original state, we will reintroduce the symlink instead as this
didn't solve the problem completely.
- commit a04d1a6
-------------------------------------------------------------------
Wed Jul 5 15:33:06 CEST 2023 - jslaby@suse.cz

33
kernel-zfcpdump.spec
View File

@ -114,7 +114,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.4.1
%if 0%{?is_kotd}
Release: <RELEASE>.g3561b10
Release: <RELEASE>.gef159e4
%else
Release: 0
%endif
@ -135,6 +135,9 @@ BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
BuildRequires: hmaccalc
%if 0%{?suse_version} > 1500
BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
# Used to sign the kernel in the buildservice
@ -242,10 +245,10 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
# END COMMON DEPS
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -503,9 +506,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if ! 0%{?usrmerged}
%regex_fixup 's,/usr/lib/modules/,/lib/modules/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -707,6 +707,14 @@ done
%install
%if 0%{?usrmerged}
# add symlink for usrmerge so install scripts will just follow the
# link and end up placing files in /usr/lib. The link will be
# removed later and is not packaged here.
mkdir -p %{buildroot}/usr/lib
ln -s usr/lib %{buildroot}/lib
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@ -1037,6 +1045,10 @@ if [ %CONFIG_MODULES = y ]; then
fi
rm -rf %{buildroot}/lib/firmware
%if 0%{?usrmerged}
# remove usrmerge aid
rm %{buildroot}/lib
%endif
add_dirs_to_filelist() {
sed -rn '
@ -1346,8 +1358,8 @@ Obsoletes: microcode_ctl < 1.18
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1580,6 +1592,9 @@ Requires: kernel-devel%variant = %version-%source_rel
Recommends: make
Recommends: gcc
Recommends: perl
%if 0%{?suse_version} > 1500
Requires: jq
%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)

4
patches.rpmify.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5bfc834c08104dd6c5011d81f17cad8ea23ffd3133e622d0456828c66a06899
size 3590
oid sha256:0bd2d51e6f39f3eb54438d1b82c2207ed8a97d7bd10c7331ae04db845f6840df
size 3621

4
source-timestamp
View File

@ -1,3 +1,3 @@
2023-07-05 13:33:06 +0000
GIT Revision: 3561b10a2dce725e0d2f5692301ad7f0fa461375
2023-07-05 14:16:56 +0000
GIT Revision: ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
GIT Branch: stable