From 588a25c1e5484e29faf775012fc032006593df4f Mon Sep 17 00:00:00 2001
From: Kernel Build Daemon <kbuild@suse.de>
Date: Jun 02 2023 10:17:27 +0000
Subject: Merge branch 'packaging' into linux-next


---

diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index b425ddd..3ea4d9b 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -407,7 +407,7 @@ cd linux-%srcversion
 	%_sourcedir/series.conf .. $SYMBOLS
 %if 0%{?usrmerged}
 # fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%variant/Makefile scripts/depmod.sh
+sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
 %endif
 
 cd %kernel_build_dir
@@ -615,7 +615,7 @@ done
 export NO_BRP_STRIP_DEBUG=true
 export STRIP_KEEP_SYMTAB='*/vmlinux*'
 
-# /lib/modules/%kernelrelease-%build_flavor/source points to the source
+# %kernel_module_directory/%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.
@@ -760,7 +760,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/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
+rm -rf %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/vdso/.build-id
 %endif
 
 # Create a dummy initrd with roughly the size the real one will have.
@@ -837,11 +837,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/lib/modules/%kernelrelease-%build_flavor/{source,build}
+    rm -f %buildroot%kernel_module_directory/%kernelrelease-%build_flavor/{source,build}
     ln -s %src_install_dir \
-	%buildroot/lib/modules/%kernelrelease-%build_flavor/source
+	%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/source
     ln -s %obj_install_dir/%cpu_arch/%build_flavor \
-	%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+	%buildroot%kernel_module_directory/%kernelrelease-%build_flavor/build
 
     # Abort if there are any undefined symbols
     msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
@@ -868,8 +868,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/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
+    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
 
     res=0
     if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
@@ -1034,7 +1034,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
     done
 
     if [ %CONFIG_MODULES = y ]; then
-	MODULES=%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor
+	MODULES=%{lua: print(rpm.expand('%kernel_module_directory'):sub(2))}/%kernelrelease-%build_flavor
 	find "$MODULES" \
 %if 0%{?separate_vdso}
 	    -path "$MODULES/vdso" -prune -o \
diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in
index 2ee8e11..ed50ac3 100644
--- a/rpm/kernel-source.spec.in
+++ b/rpm/kernel-source.spec.in
@@ -225,7 +225,7 @@ cd linux-%kernelrelease-vanilla
 rm -f $(find . -name ".gitignore")
 %if 0%{?usrmerged}
 # fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%variant/Makefile scripts/depmod.sh
+sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
 %endif
 # Hardlink duplicate files automatically (from package fdupes).
 %fdupes $PWD
@@ -241,7 +241,7 @@ if [ -f %_sourcedir/localversion ] ; then
 fi
 %if 0%{?usrmerged}
 # fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%variant/Makefile scripts/depmod.sh
+sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile scripts/depmod.sh
 %endif
 # Hardlink duplicate files automatically (from package fdupes).
 %fdupes $PWD