From a6ad8af207e68901704e870912d3799901dfb432 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mar 05 2024 16:47:59 +0000 Subject: rpm templates: Always define usrmerged usrmerged is now defined in kernel-spec-macros and not the distribution. Only check if it's defined in kernel-spec-macros, not everywhere where it's used. --- diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 38c9863..e114c6d 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -229,7 +229,7 @@ Requires(post): dracut # the grub entry has correct title (bnc#757565) Requires(post): distribution-release -%if 0%{?usrmerged} +%if %{usrmerged} # make sure we have a post-usrmerge system Conflicts: filesystem < 16 %endif @@ -656,7 +656,7 @@ add_vmlinux() # sign the modules, firmware and possibly the kernel in the buildservice BRP_PESIGN_FILES="" %if "%CONFIG_EFI_STUB" == "y" -%if 0%{?usrmerged} +%if %{usrmerged} BRP_PESIGN_FILES="%modules_dir/%image" %else BRP_PESIGN_FILES="/boot/%image-%kernelrelease-%build_flavor" @@ -664,7 +664,7 @@ BRP_PESIGN_FILES="/boot/%image-%kernelrelease-%build_flavor" %endif %if ! %sb_efi_only %ifarch s390x ppc64 ppc64le -%if 0%{?usrmerged} +%if %{usrmerged} BRP_PESIGN_FILES="%modules_dir/%image" %else BRP_PESIGN_FILES="/boot/%image-%kernelrelease-%build_flavor" @@ -936,7 +936,7 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then fi # does not exist for non-modularized kernels -%if 0%{?usrmerged} +%if %{usrmerged} mkdir -p %{buildroot}%modules_dir %endif shopt -s nullglob dotglob @@ -946,7 +946,7 @@ shopt -s nullglob dotglob echo "%modules_dir/source" cd %buildroot for file in boot/symtypes*; do -%if 0%{?usrmerged} +%if %{usrmerged} l="${file##*/}" l="%modules_dir/${l//-%kernelrelease-%build_flavor}" mv "$file" "%{buildroot}$l" @@ -991,19 +991,19 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files echo -n "%%ghost " fi ;; -%if 0%{?usrmerged} +%if %{usrmerged} boot/vmlinuz-*) echo -n "%%attr(0644, root, root) " ;; %endif boot/symtypes*) -%if 0%{?usrmerged} +%if %{usrmerged} echo "%exclude $l" %endif continue ;; esac -%if 0%{?usrmerged} +%if %{usrmerged} mv "$f" "./$l" ln -s "..$l" $f # the find in the CONFIG_MODULES condition below also finds the files @@ -1027,7 +1027,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files ! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune \ -o \( -type f \ -%if 0%{?usrmerged} +%if %{usrmerged} ! -path '*/symtypes*' ! -path '*/vmlinu*' \ %endif \) -printf '/%%p\n' @@ -1075,7 +1075,7 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files %if 0%{?sle_version} > 150300 modprobe_d_dir=/lib/modprobe.d %endif - %if 0%{?usrmerged} + %if %{usrmerged} modprobe_d_dir=/usr/lib/modprobe.d %endif @@ -1114,35 +1114,35 @@ fi %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %endif %post %if "%build_flavor" != "zfcpdump" %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %endif %preun %if "%build_flavor" != "zfcpdump" %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %endif %posttrans %if "%build_flavor" != "zfcpdump" %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files @@ -1172,31 +1172,31 @@ This package contains only the base modules, required in all installs. %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %post base %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name-base" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %preun base %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name-base" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %postun base %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name-base" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %posttrans base %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name-base" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %files base -f kernel-base.files %endif @@ -1240,31 +1240,31 @@ This package contains additional modules not supported by SUSE. %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %post extra %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %preun extra %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %postun extra %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %posttrans extra %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %if %split_extra @@ -1309,31 +1309,31 @@ This package contains optional modules only for openSUSE Leap. %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %post optional %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %preun optional %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %postun optional %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %posttrans optional %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files %endif @@ -1502,31 +1502,31 @@ Supplements: packageand(%name:@KMP_NAME@-%build_flavor) %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %post -n @KMP_NAME@-%build_flavor %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %preun -n @KMP_NAME@-%build_flavor %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %postun -n @KMP_NAME@-%build_flavor %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %posttrans -n @KMP_NAME@-%build_flavor %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ - --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" + --usrmerged "%{usrmerged}" --certs "%certs" "$@" %files -n @KMP_NAME@-%build_flavor -f @KMP_NAME@.files # END KMP diff --git a/rpm/kernel-module-subpackage b/rpm/kernel-module-subpackage index fa4c9bb..387d9d7 100644 --- a/rpm/kernel-module-subpackage +++ b/rpm/kernel-module-subpackage @@ -73,27 +73,27 @@ END { exit(! good) } %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-pre --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" + --flavor "%1" --usrmerged "%{usrmerged}" "$@" %post -n %{-n*}-kmp-%1 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-post --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" + --flavor "%1" --usrmerged "%{usrmerged}" "$@" %preun -n %{-n*}-kmp-%1 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" + --flavor "%1" --usrmerged "%{usrmerged}" "$@" %postun -n %{-n*}-kmp-%1 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" + --flavor "%1" --usrmerged "%{usrmerged}" "$@" %posttrans -n %{-n*}-kmp-%1 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-posttrans --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ - --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" + --flavor "%1" --usrmerged "%{usrmerged}" "$@" %files -n %{-n*}-kmp-%1 %{-f:%{expand:%(cd %_sourcedir; cat %{-f*})}} %{!-f:%defattr (-,root,root)} diff --git a/rpm/kernel-spec-macros b/rpm/kernel-spec-macros index edd768a..55f613b 100644 --- a/rpm/kernel-spec-macros +++ b/rpm/kernel-spec-macros @@ -11,8 +11,10 @@ %endif # TW is usrmerged -%if %{undefined usrmerged} && 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 %define usrmerged 1 +%else +%define usrmerged 0 %endif # source_rel is the package release string, without the rebuild counter @@ -68,7 +70,7 @@ rm -f "$2" && ln -s "$1" "$2" \ } -%if 0%{?usrmerged} +%if %{usrmerged} %define kernel_module_directory /usr/lib/modules %else %define kernel_module_directory /lib/modules diff --git a/rpm/macros.kernel-source b/rpm/macros.kernel-source index 78b4126..c2ec2be 100644 --- a/rpm/macros.kernel-source +++ b/rpm/macros.kernel-source @@ -6,6 +6,7 @@ else \ print( "" ) \ end } +%usrmerged %{lua: susever = rpm.expand('%{?suse_version}'); if susever ~= '' and tonumber(susever) > 1550 then print('1') else print('0') end } %kernel_module_package_release 1 %kernel_module_package_buildreqs modutils kernel-syms kmod-compat suse-kernel-rpm-scriptlets %kernel_build_shell_package