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

commit 6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1942
This commit is contained in:
Kernel Bugs 2023-06-03 08:10:32 +00:00 committed by Git OBS Bridge
parent 7db9a17aea
commit 567c8a215b
37 changed files with 507 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dtb-aarch64.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

2
dtb-aarch64.spec
View File

@ -31,7 +31,7 @@
Name: dtb-aarch64
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif

16
dtb-armv6l.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

2
dtb-armv6l.spec
View File

@ -31,7 +31,7 @@
Name: dtb-armv6l
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif

16
dtb-armv7l.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

2
dtb-armv7l.spec
View File

@ -31,7 +31,7 @@
Name: dtb-armv7l
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif

16
dtb-riscv64.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

2
dtb-riscv64.spec
View File

@ -31,7 +31,7 @@
Name: dtb-riscv64
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif

16
kernel-64kb.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

40
kernel-64kb.spec
View File

@ -113,7 +113,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -238,10 +238,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-%build_flavor-base-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: kernel-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
# END COMMON DEPS
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -474,10 +474,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -679,12 +675,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -829,7 +833,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -906,11 +910,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -937,8 +941,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -1003,6 +1007,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 '
@ -1103,7 +1111,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

32
kernel-binary.spec.in
View File

@ -341,10 +341,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -546,12 +542,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -696,7 +700,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -773,11 +777,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -804,8 +808,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -870,6 +874,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 '
@ -970,7 +978,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

16
kernel-debug.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

40
kernel-debug.spec
View File

@ -113,7 +113,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -238,10 +238,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-%build_flavor-base-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: kernel-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
# END COMMON DEPS
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
@ -480,10 +480,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -685,12 +681,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -835,7 +839,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -912,11 +916,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -943,8 +947,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -1009,6 +1013,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 '
@ -1109,7 +1117,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

16
kernel-default.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

40
kernel-default.spec
View File

@ -113,7 +113,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -238,10 +238,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-%build_flavor-base-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: kernel-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
# END COMMON DEPS
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
@ -523,10 +523,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -728,12 +724,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -878,7 +882,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -955,11 +959,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -986,8 +990,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -1052,6 +1056,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 '
@ -1152,7 +1160,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

16
kernel-docs.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

4
kernel-docs.spec
View File

@ -33,7 +33,7 @@ License: GPL-2.0-only
Group: Documentation/Man
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -67,7 +67,7 @@ BuildRequires: texlive-zapfding
%endif
URL: https://www.kernel.org/
Provides: %name = %version-%source_rel
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
BuildArch: noarch
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc

16
kernel-kvmsmall.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

40
kernel-kvmsmall.spec
View File

@ -113,7 +113,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -238,10 +238,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-%build_flavor-base-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: kernel-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
# END COMMON DEPS
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -478,10 +478,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -683,12 +679,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -833,7 +837,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -910,11 +914,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -941,8 +945,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -1007,6 +1011,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 '
@ -1107,7 +1115,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

16
kernel-lpae.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

40
kernel-lpae.spec
View File

@ -113,7 +113,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -238,10 +238,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-%build_flavor-base-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: kernel-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
# END COMMON DEPS
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -472,10 +472,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -677,12 +673,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -827,7 +831,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -904,11 +908,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -935,8 +939,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -1001,6 +1005,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 '
@ -1101,7 +1109,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

16
kernel-obs-build.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 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-891ca117ca9f7bfd1a57483d425bafa3d08b0551
BuildRequires: kernel%kernel_flavor-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%if 0%{?rhel_version}
BuildRequires: kernel
@ -58,7 +58,7 @@ License: GPL-2.0-only
Group: SLES
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif

16
kernel-obs-qa.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 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.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif

16
kernel-pae.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

40
kernel-pae.spec
View File

@ -113,7 +113,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -238,10 +238,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-%build_flavor-base-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: kernel-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
# END COMMON DEPS
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
@ -500,10 +500,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -705,12 +701,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -855,7 +859,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -932,11 +936,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -963,8 +967,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -1029,6 +1033,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 '
@ -1129,7 +1137,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

16
kernel-source.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

16
kernel-source.spec
View File

@ -32,7 +32,7 @@
Name: kernel-source
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -49,7 +49,7 @@ BuildRequires: fdupes
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: linux
Provides: multiversion(kernel)
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
@ -223,6 +223,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 \
@ -230,10 +234,6 @@ fi
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..
@ -246,10 +246,6 @@ rm -f $(find . -name ".gitignore")
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..

12
kernel-source.spec.in
View File

@ -223,6 +223,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 \
@ -230,10 +234,6 @@ fi
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..
@ -246,10 +246,6 @@ rm -f $(find . -name ".gitignore")
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..

16
kernel-syms.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

4
kernel-syms.spec
View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 6.3.5
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%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-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel

16
kernel-vanilla.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

40
kernel-vanilla.spec
View File

@ -113,7 +113,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -238,10 +238,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-%build_flavor-base-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: kernel-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
# END COMMON DEPS
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -471,10 +471,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -676,12 +672,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -826,7 +830,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -903,11 +907,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -934,8 +938,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -1000,6 +1004,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 '
@ -1100,7 +1108,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

16
kernel-zfcpdump.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 2 08:15:14 CEST 2023 - jslaby@suse.cz
- Revert "Remove usrmerge compatibility symlink in buildroot (boo#1211796)"
This reverts commit b8e00c5a84bcd75a1e2c491b6de601278e1572c7. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 6db9c44
-------------------------------------------------------------------
Fri Jun 2 08:14:31 CEST 2023 - jslaby@suse.cz
- Revert "Fix usrmerge error (boo#1211796)"
This reverts commit da84579e78f4c4efa5b3b910484fdaedc79fefec. It still
breaks build as it needs support in kmod (SR#1089967).
- commit 4b4675f
-------------------------------------------------------------------
Fri Jun 2 06:30:32 CEST 2023 - jslaby@suse.cz

40
kernel-zfcpdump.spec
View File

@ -113,7 +113,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.3.5
%if 0%{?is_kotd}
Release: <RELEASE>.g891ca11
Release: <RELEASE>.g6db9c44
%else
Release: 0
%endif
@ -238,10 +238,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Provides: kernel-%build_flavor-base-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: kernel-%build_flavor-base-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
Provides: kernel-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
# END COMMON DEPS
Provides: %name-srchash-891ca117ca9f7bfd1a57483d425bafa3d08b0551
Provides: %name-srchash-6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
%obsolete_rebuilds %name
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@ -474,10 +474,6 @@ cd linux-%srcversion
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
%if 0%{?usrmerged}
# fix MODLIB so kmps install to /usr
sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
%endif
cd %kernel_build_dir
@ -679,12 +675,20 @@ 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
export STRIP_KEEP_SYMTAB='*/vmlinux*'
# %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
# /lib/modules/%kernelrelease-%build_flavor/source points to the source
# directory installed by kernel-devel. The kernel-%build_flavor-devel package
# has a correct dependency on kernel-devel, but the brp check does not see
# kernel-devel during build.
@ -829,7 +833,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -906,11 +910,11 @@ if [ %CONFIG_MODULES = y ]; then
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@ -937,8 +941,8 @@ if [ %CONFIG_MODULES = y ]; then
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
# checksums always the same for several builds of the same package.
test -s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/modules.dep) count=1
test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \
dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@ -1003,6 +1007,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 '
@ -1103,7 +1111,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
done
if [ %CONFIG_MODULES = y ]; then
MODULES=%{lua: print(macros.kernel_module_directory:sub(2))}/%kernelrelease-%build_flavor
MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
find "$MODULES" \
%if 0%{?separate_vdso}
-path "$MODULES/vdso" -prune -o \

4
source-timestamp
View File

@ -1,3 +1,3 @@
2023-06-02 04:31:17 +0000
GIT Revision: 891ca117ca9f7bfd1a57483d425bafa3d08b0551
2023-06-02 06:15:14 +0000
GIT Revision: 6db9c44d07ee5bb9d1556fb52efbec6bb26b00a3
GIT Branch: stable