commit 3561b10a2dce725e0d2f5692301ad7f0fa461375
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1967
This commit is contained in:
parent
70f29298c4
commit
cbac1138e8
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
Name: dtb-aarch64
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
Name: dtb-armv6l
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
Name: dtb-armv7l
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
Name: dtb-riscv64
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -114,7 +114,7 @@ License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -135,9 +135,6 @@ 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
|
||||
@ -245,10 +242,10 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
%obsolete_rebuilds %name
|
||||
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
|
||||
Source3: kernel-source.rpmlintrc
|
||||
@ -506,6 +503,9 @@ 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,14 +707,6 @@ 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
|
||||
@ -1045,10 +1037,6 @@ 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 '
|
||||
@ -1358,8 +1346,8 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%obsolete_rebuilds %name-base
|
||||
%ifarch %ix86
|
||||
@ -1592,9 +1580,6 @@ 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)
|
||||
|
@ -135,9 +135,6 @@ 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
|
||||
@ -367,6 +364,9 @@ 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,14 +568,6 @@ 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
|
||||
@ -906,10 +898,6 @@ 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 '
|
||||
@ -1374,9 +1362,6 @@ 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)
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -114,7 +114,7 @@ License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -135,9 +135,6 @@ 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
|
||||
@ -245,10 +242,10 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
%ifarch ppc64
|
||||
Provides: kernel-kdump = 2.6.28
|
||||
Obsoletes: kernel-kdump <= 2.6.28
|
||||
@ -512,6 +509,9 @@ 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,14 +713,6 @@ 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
|
||||
@ -1051,10 +1043,6 @@ 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 '
|
||||
@ -1364,8 +1352,8 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%ifarch ppc64
|
||||
Provides: kernel-kdump-base = 2.6.28
|
||||
@ -1604,9 +1592,6 @@ 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)
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -114,7 +114,7 @@ License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -135,9 +135,6 @@ 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
|
||||
@ -245,10 +242,10 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
%ifarch %ix86
|
||||
Provides: kernel-smp = 2.6.17
|
||||
Obsoletes: kernel-smp <= 2.6.17
|
||||
@ -555,6 +552,9 @@ 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,14 +756,6 @@ 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
|
||||
@ -1094,10 +1086,6 @@ 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 '
|
||||
@ -1407,8 +1395,8 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%ifarch %ix86
|
||||
Provides: kernel-trace-base = 3.13
|
||||
@ -1704,9 +1692,6 @@ 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)
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -32,7 +32,7 @@ License: GPL-2.0-only
|
||||
Group: Documentation/Man
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%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-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
BuildArch: noarch
|
||||
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
|
||||
Source3: kernel-source.rpmlintrc
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -114,7 +114,7 @@ License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -135,9 +135,6 @@ 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
|
||||
@ -245,10 +242,10 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
%obsolete_rebuilds %name
|
||||
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
|
||||
Source3: kernel-source.rpmlintrc
|
||||
@ -510,6 +507,9 @@ 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,14 +711,6 @@ 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
|
||||
@ -1049,10 +1041,6 @@ 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,8 +1350,8 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%obsolete_rebuilds %name-base
|
||||
%ifarch %ix86
|
||||
@ -1608,9 +1596,6 @@ 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)
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -114,7 +114,7 @@ License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -135,9 +135,6 @@ 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
|
||||
@ -245,10 +242,10 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
%obsolete_rebuilds %name
|
||||
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
|
||||
Source3: kernel-source.rpmlintrc
|
||||
@ -504,6 +501,9 @@ 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,14 +705,6 @@ 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,10 +1035,6 @@ 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 '
|
||||
@ -1356,8 +1344,8 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%obsolete_rebuilds %name-base
|
||||
%ifarch %ix86
|
||||
@ -1584,9 +1572,6 @@ 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)
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -44,7 +44,7 @@ BuildRequires: util-linux
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: kernel%kernel_flavor-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
BuildRequires: kernel%kernel_flavor-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%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>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -34,7 +34,7 @@ License: GPL-2.0-only
|
||||
Group: SLES
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -114,7 +114,7 @@ License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -135,9 +135,6 @@ 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
|
||||
@ -245,10 +242,10 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
%ifarch %ix86
|
||||
Provides: kernel-bigsmp = 2.6.17
|
||||
Obsoletes: kernel-bigsmp <= 2.6.17
|
||||
@ -532,6 +529,9 @@ 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,14 +733,6 @@ 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
|
||||
@ -1071,10 +1063,6 @@ 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 '
|
||||
@ -1384,8 +1372,8 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%ifarch %ix86
|
||||
Provides: kernel-vmi-base = 2.6.38
|
||||
@ -1660,9 +1648,6 @@ 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)
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -32,7 +32,7 @@
|
||||
Name: kernel-source
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -49,7 +49,7 @@ BuildRequires: fdupes
|
||||
BuildRequires: sed
|
||||
Requires(post): coreutils sed
|
||||
Provides: %name = %version-%source_rel
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: linux
|
||||
Provides: multiversion(kernel)
|
||||
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
|
||||
@ -134,9 +134,6 @@ 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
|
||||
@ -229,10 +226,6 @@ 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 \
|
||||
@ -240,6 +233,9 @@ sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%vari
|
||||
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 ..
|
||||
@ -252,6 +248,9 @@ 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 ..
|
||||
|
@ -134,9 +134,6 @@ 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
|
||||
@ -229,10 +226,6 @@ 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 \
|
||||
@ -240,6 +233,9 @@ sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%vari
|
||||
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 ..
|
||||
@ -252,6 +248,9 @@ 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 ..
|
||||
|
@ -83,3 +83,15 @@ 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
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -27,7 +27,7 @@ Group: Development/Sources
|
||||
Version: 6.4.1
|
||||
%if %using_buildservice
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%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-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: multiversion(kernel)
|
||||
Source: README.KSYMS
|
||||
Requires: kernel-devel%variant = %version-%source_rel
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -114,7 +114,7 @@ License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -135,9 +135,6 @@ 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
|
||||
@ -245,10 +242,10 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
%obsolete_rebuilds %name
|
||||
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
|
||||
Source3: kernel-source.rpmlintrc
|
||||
@ -503,6 +500,9 @@ 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,14 +704,6 @@ 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
|
||||
@ -1042,10 +1034,6 @@ 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 '
|
||||
@ -1355,8 +1343,8 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%obsolete_rebuilds %name-base
|
||||
%ifarch %ix86
|
||||
@ -1580,9 +1568,6 @@ 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)
|
||||
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -114,7 +114,7 @@ License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Version: 6.4.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gef159e4
|
||||
Release: <RELEASE>.g3561b10
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -135,9 +135,6 @@ 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
|
||||
@ -245,10 +242,10 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: %name-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
%obsolete_rebuilds %name
|
||||
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
|
||||
Source3: kernel-source.rpmlintrc
|
||||
@ -506,6 +503,9 @@ 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,14 +707,6 @@ 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
|
||||
@ -1045,10 +1037,6 @@ 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 '
|
||||
@ -1358,8 +1346,8 @@ Obsoletes: microcode_ctl < 1.18
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-srchash-ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
Provides: kernel-%build_flavor-base-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
Provides: kernel-srchash-3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
|
||||
%obsolete_rebuilds %name-base
|
||||
%ifarch %ix86
|
||||
@ -1592,9 +1580,6 @@ 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)
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0bd2d51e6f39f3eb54438d1b82c2207ed8a97d7bd10c7331ae04db845f6840df
|
||||
size 3621
|
||||
oid sha256:d5bfc834c08104dd6c5011d81f17cad8ea23ffd3133e622d0456828c66a06899
|
||||
size 3590
|
||||
|
@ -1,3 +1,3 @@
|
||||
2023-07-05 14:16:56 +0000
|
||||
GIT Revision: ef159e42ce3cbb3ce8e84782cf61ac052a2597c5
|
||||
2023-07-05 13:33:06 +0000
|
||||
GIT Revision: 3561b10a2dce725e0d2f5692301ad7f0fa461375
|
||||
GIT Branch: stable
|
||||
|
Loading…
Reference in New Issue
Block a user