Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2023-08-16 14:16:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.11712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools" Wed Aug 16 14:16:38 2023 rev:66 rq:1104074 version:16.0.33 Changes: -------- --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2023-07-05 15:30:26.822526077 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.11712/suse-module-tools.changes 2023-08-16 14:16:58.786928578 +0200 @@ -1,0 +2,10 @@ +Tue Aug 15 16:12:13 UTC 2023 - Martin Wilck <[email protected]> + +- Update to version 16.0.33: + * change wording in filesystem blacklist files + (gh#openSUSE/suse-module-tools#71) + * rpm-script: update bootloader after creating initramfs + (boo#1213822) + * usrmerge: Drop support for non-usrmerged (boo#1206798) + +------------------------------------------------------------------- Old: ---- suse-module-tools-16.0.32.obscpio New: ---- suse-module-tools-16.0.33.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-module-tools.spec ++++++ --- /var/tmp/diff_new_pack.IgOf4T/_old 2023-08-16 14:16:59.358932583 +0200 +++ /var/tmp/diff_new_pack.IgOf4T/_new 2023-08-16 14:16:59.358932583 +0200 @@ -15,24 +15,15 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# missing in SLE15 (systemd-rpm-macros) -%{!?_modulesloaddir: %global _modulesloaddir /usr/lib/modules-load.d} - # Location for modprobe and depmod .conf files # # This assumes post-usr-merge (20210527) for Tumbleweed -%if 0%{?suse_version} >= 1550 %global modprobe_dir /usr/lib/modprobe.d %global depmod_dir /usr/lib/depmod.d %global with_kernel_sysctl 1 # boot_sysctl may be dropped on TW when we can assume that nobody keeps # kernel packages around that store sysctl files under /boot %bcond_without boot_sysctl -%else -%global modprobe_dir /lib/modprobe.d -%global depmod_dir /lib/depmod.d -%global with_boot_sysctl 1 -%endif %global sysctl_dropin %{_unitdir}/systemd-sysctl.service.d/50-kernel-uname_r.conf %global systemd_units %{?with_boot_sysctl:boot-sysctl.service} %{?with_kernel_sysctl:kernel-sysctl.service} @@ -45,7 +36,7 @@ %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g') Name: suse-module-tools -Version: 16.0.32 +Version: 16.0.33 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -64,9 +55,6 @@ Requires(post): /usr/bin/grep Requires(post): /usr/bin/sed Requires(post): coreutils -%if 0%{?suse_version} < 1550 -Provides: suse-kernel-rpm-scriptlets = 0 -%endif Provides: udev-extra-rules = 0.3.0 Obsoletes: udev-extra-rules < 0.3.0 Provides: system-tuning-common-SUSE = 0.3.0 @@ -79,9 +67,7 @@ # This release requires the dracut module 90nvdimm Conflicts: dracut < 49.1 # TW: conflict with pre-usrmerge -%if 0%{?suse_version} >= 1550 -Conflicts: filesystem < 15.5-40.2 -%endif +Conflicts: filesystem < 16 %description This package contains helper scripts for KMP installation and @@ -89,7 +75,6 @@ modprobe. -%if 0%{?suse_version} >= 1550 %package scriptlets Summary: Kernel rpm scriptlets Provides: suse-kernel-rpm-scriptlets = 0 @@ -98,7 +83,6 @@ %description scriptlets Scripts called by the SUSE kernel packages on installation -%endif %prep %setup -q @@ -109,20 +93,7 @@ %install install -d -m 755 "%{buildroot}%{modprobe_dir}" install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d" -# keep /etc clean on Tumbleweed -%if 0%{?suse_version} < 1550 -cat > "%{buildroot}%{_sysconfdir}/modprobe.d/README" <<EOF -Local configuration for modprobe(8) -=================================== - -The distribution-provided modprobe configuration files have moved to %{modprobe_dir}. -To modify the configuration, copy files from %{modprobe_dir} to this directory -(%{_sysconfdir}/modprobe.d) and edit them here. - -See also %{modprobe_dir}/README, %{_defaultdocdir}/%{name}/README.md, and the -man page modprobe.d(5). -EOF -%endif + install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/common/*.conf if [ -d modprobe.conf/%{_arch} ]; then install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/%{_arch}/*.conf @@ -142,14 +113,6 @@ install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" install -pm 755 -t "%{buildroot}/usr/lib/module-init-tools/" \ weak-modules2 driver-check.sh unblacklist lsinitrd-quick - -%if 0%{?suse_version} < 1550 -# rpm macros and helper -# The RPM Macros have been moved to the package rpm-config-SUSE after CODE15, thus are no longer -# shipped here -install -d -m 755 "%{buildroot}%{_rpmmacrodir}" -install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" -%endif install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/" install -d -m 755 "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" install -pm 755 "kernel-scriptlets/cert-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" @@ -192,13 +155,12 @@ mkdir -p %{buildroot}%{_defaultlicensedir} -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 for mod in %{fs_blacklist}; do echo "\ # DO NOT EDIT THIS FILE! # # The $mod file system is blacklisted by default because it isn't actively -# supported by SUSE, not well maintained, or may have security vulnerabilites. +# supported by SUSE. blacklist $mod # The filesystem can be un-blacklisted by running \"modprobe $mod\". # See README.md in the %{name} package for details. @@ -206,7 +168,6 @@ " \ >%{buildroot}%{modprobe_dir}/60-blacklist_fs-"$mod".conf done -%endif %pre %service_add_pre %{systemd_units} @@ -259,10 +220,6 @@ %dir %{_sysconfdir}/modprobe.d %{depmod_dir} %dir %{_sysconfdir}/depmod.d -%if 0%{?suse_version} < 1550 -%{_sysconfdir}/modprobe.d/README -%{_rpmmacrodir}/macros.initrd -%endif %{_bindir}/kmp-install %dir /usr/lib/module-init-tools /usr/lib/module-init-tools/driver-check.sh @@ -278,9 +235,7 @@ /usr/lib/systemd/system-generators %endif # -%if 0%{?suse_version} >= 1550 %files scriptlets -%endif /usr/lib/module-init-tools/kernel-scriptlets %changelog ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.IgOf4T/_old 2023-08-16 14:16:59.402932891 +0200 +++ /var/tmp/diff_new_pack.IgOf4T/_new 2023-08-16 14:16:59.406932918 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/suse-module-tools.git</param> - <param name="changesrevision">eecfaab275ec7a166a6fefebadd884a0bec0b8e3</param></service></servicedata> + <param name="changesrevision">68458f207a240eccc77fe87f2b947fcd6a01eaa1</param></service></servicedata> (No newline at EOF) ++++++ suse-module-tools-16.0.32.obscpio -> suse-module-tools-16.0.33.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.32/.obs/workflows.yml new/suse-module-tools-16.0.33/.obs/workflows.yml --- old/suse-module-tools-16.0.32/.obs/workflows.yml 2023-07-03 21:35:50.000000000 +0200 +++ new/suse-module-tools-16.0.33/.obs/workflows.yml 2023-08-15 16:09:18.000000000 +0200 @@ -14,29 +14,5 @@ architectures: - x86_64 - i586 - - name: openSUSE_Leap_15.4 - paths: - - target_project: openSUSE:Leap:15.4 - target_repository: standard - architectures: - - x86_64 - - name: SLE_15_SP4 - paths: - - target_project: SUSE:SLE-15-SP4:GA - target_repository: pool - architectures: - - x86_64 - - s390x - - ppc64le - - aarch64 - - name: SLE_15_SP3 - paths: - - target_project: SUSE:SLE-15-SP3:GA - target_repository: pool - architectures: - - x86_64 - - s390x - - ppc64le - - aarch64 filters: event: pull_request diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.32/kernel-scriptlets/inkmp-script new/suse-module-tools-16.0.33/kernel-scriptlets/inkmp-script --- old/suse-module-tools-16.0.32/kernel-scriptlets/inkmp-script 2023-07-03 21:35:50.000000000 +0200 +++ new/suse-module-tools-16.0.33/kernel-scriptlets/inkmp-script 2023-08-15 16:09:18.000000000 +0200 @@ -8,7 +8,6 @@ kernelrelease="" flavor="" variant="" -usrmerged="0" image="" certs="" @@ -41,7 +40,7 @@ ;; --usrmerged) - usrmerged="$2" + # ignored for legacy compat reasons shift ;; --image) @@ -62,13 +61,8 @@ wm2=/usr/lib/module-init-tools/weak-modules2 nvr="$name"-"$version"-"$release" -if [ "$usrmerged" -ne 0 ] ; then - modules_dir=/usr/lib/modules/$kernelrelease-$flavor - system_map=${modules_dir}/System.map -else - modules_dir=/lib/modules/$kernelrelease-$flavor - system_map=/boot/System.map-$kernelrelease-$flavor -fi +modules_dir=/usr/lib/modules/$kernelrelease-$flavor +system_map=${modules_dir}/System.map run_wm2() { [ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || echo wm2 "$@" >&2 @@ -78,7 +72,7 @@ [ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || \ echo KMP "$op" name: "$name" version: "$version" release: "$release" \ kernelrelease: "$kernelrelease" flavor: "$flavor" variant: "$variant" \ - usrmerged: "$usrmerged" image: "$image" certs: "$certs" -- "$@" >&2 + image: "$image" certs: "$certs" -- "$@" >&2 script_rc=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.32/kernel-scriptlets/kmp-script new/suse-module-tools-16.0.33/kernel-scriptlets/kmp-script --- old/suse-module-tools-16.0.32/kernel-scriptlets/kmp-script 2023-07-03 21:35:50.000000000 +0200 +++ new/suse-module-tools-16.0.33/kernel-scriptlets/kmp-script 2023-08-15 16:09:18.000000000 +0200 @@ -7,7 +7,6 @@ release="" kernelrelease="" flavor="" -usrmerged="" while true ; do case $1 in @@ -33,7 +32,7 @@ shift ;; --usrmerged) - usrmerged="$2" + # ignored for legacy compat reasons shift ;; @@ -53,7 +52,7 @@ [ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || \ echo KMP "$op" name: "$name" version: "$version" release: "$release" \ - kernelrelease: "$kernelrelease" flavor: "$flavor" \ usrmerged: "$usrmerged" -- "$@" >&2 + kernelrelease: "$kernelrelease" flavor: "$flavor" -- "$@" >&2 script_rc=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.32/kernel-scriptlets/rpm-script new/suse-module-tools-16.0.33/kernel-scriptlets/rpm-script --- old/suse-module-tools-16.0.32/kernel-scriptlets/rpm-script 2023-07-03 21:35:50.000000000 +0200 +++ new/suse-module-tools-16.0.33/kernel-scriptlets/rpm-script 2023-08-15 16:09:18.000000000 +0200 @@ -8,7 +8,6 @@ kernelrelease="" flavor="" variant="" -usrmerged="0" image="" certs="" @@ -41,7 +40,7 @@ ;; --usrmerged) - usrmerged="$2" + # ignored for legacy compat reasons shift ;; --image) @@ -62,13 +61,8 @@ wm2=/usr/lib/module-init-tools/weak-modules2 nvr="$name"-"$version"-"$release" -if [ "$usrmerged" -ne 0 ] ; then - modules_dir=/usr/lib/modules/$kernelrelease-$flavor - system_map=${modules_dir}/System.map -else - modules_dir=/lib/modules/$kernelrelease-$flavor - system_map=/boot/System.map-$kernelrelease-$flavor -fi +modules_dir=/usr/lib/modules/$kernelrelease-$flavor +system_map=${modules_dir}/System.map trigger_purge_kernels() { [ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || echo Triggering purge-kernels >&2 @@ -90,10 +84,41 @@ echo "available bootloader for your platform (e.g. grub, lilo, zipl, ...)." } +update_bootloader() { + if [ ! -e /.buildenv ] ; then + if [ -f /etc/fstab ] ; then + # only run the bootloader if the usual bootloader configuration + # files are there -- this is different on every architecture + initrd=initrd-"$kernelrelease"-"$flavor" + if [ "$flavor" = rt ]; then + default=force-default + fi + # Note: the 2nd condition is for removing the bootloader + # entry for an uninstalled kernel. + if [ -e /boot/$initrd -o ! -e "$modules_dir" ]; then + [ -e /boot/$initrd ] || initrd= + if [ -x /usr/lib/bootloader/bootloader_entry ]; then + /usr/lib/bootloader/bootloader_entry \ + add \ + "$flavor" \ + "$kernelrelease"-"$flavor" \ + "$image"-"$kernelrelease"-"$flavor" \ + $initrd \ + $default || script_rc=$? + else + message_install_bl + fi + fi + else + message_install_bl + fi + fi +} + [ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || \ echo "$op" name: "$name" version: "$version" release: "$release" \ kernelrelease: "$kernelrelease" flavor: "$flavor" variant: "$variant" \ - usrmerged: "$usrmerged" image: "$image" certs: "$certs" -- "$@" >&2 + image: "$image" certs: "$certs" -- "$@" >&2 script_rc=0 @@ -174,27 +199,25 @@ ln -s ${x##*/}-"$kernelrelease"-"$flavor" $x done - if [ "$usrmerged" -ne 0 ] ; then - # compat stuff for /boot. - # if /boot and /usr are not speparate partitions we can just link - # the kernel there to save space. Otherwise copy. - if mountpoint -q /boot || mountpoint -q /usr; then - copy_or_link="cp -a --remove-destination" - separate_boot='1' - else - copy_or_link="ln -sf" - separate_boot="" - fi - # XXX: need to fix suse-module-tools for sysctl.conf and System.map - for x in "$image" sysctl.conf System.map config; do - if [ "$separate_boot" = 1 ] || [ ! -e /boot/$x-"$kernelrelease"-"$flavor" ]; then - $copy_or_link .."$modules_dir"/$x /boot/$x-"$kernelrelease"-"$flavor" || script_rc=$? - if [ -e "$modules_dir"/.$x.hmac ]; then - $copy_or_link .."$modules_dir"/.$x.hmac /boot/.$x-"$kernelrelease"-"$flavor".hmac || script_rc=$? - fi - fi - done + # compat stuff for /boot. + # if /boot and /usr are not speparate partitions we can just link + # the kernel there to save space. Otherwise copy. + if mountpoint -q /boot || mountpoint -q /usr; then + copy_or_link="cp -a --remove-destination" + separate_boot='1' + else + copy_or_link="ln -sf" + separate_boot="" fi + # XXX: need to fix suse-module-tools for sysctl.conf and System.map + for x in "$image" sysctl.conf System.map config; do + if [ "$separate_boot" = 1 ] || [ ! -e /boot/$x-"$kernelrelease"-"$flavor" ]; then + $copy_or_link .."$modules_dir"/$x /boot/$x-"$kernelrelease"-"$flavor" || script_rc=$? + if [ -e "$modules_dir"/.$x.hmac ]; then + $copy_or_link .."$modules_dir"/.$x.hmac /boot/.$x-"$kernelrelease"-"$flavor".hmac || script_rc=$? + fi + fi + done # Add symlinks of compatible modules to /lib/modules/$krel/weak-updates/, # run depmod and dracut @@ -205,35 +228,7 @@ script_rc=1 fi - if [ ! -e /.buildenv ] ; then - if [ -f /etc/fstab ] ; then - # only run the bootloader if the usual bootloader configuration - # files are there -- this is different on every architecture - initrd=initrd-"$kernelrelease"-"$flavor" - if [ "$flavor" = rt ]; then - default=force-default - fi - # Note: the 2nd condition is for removing the bootloader - # entry for an uninstalled kernel. - if [ -e /boot/$initrd -o ! -e "$modules_dir" ]; then - [ -e /boot/$initrd ] || initrd= - if [ -x /usr/lib/bootloader/bootloader_entry ]; then - /usr/lib/bootloader/bootloader_entry \ - add \ - "$flavor" \ - "$kernelrelease"-"$flavor" \ - "$image"-"$kernelrelease"-"$flavor" \ - $initrd \ - $default || script_rc=$? - else - message_install_bl - fi - fi - else - message_install_bl - fi - fi - + [ "$INITRD_IN_POSTTRANS" ] || update_bootloader [ -z "$certs" ] || /usr/lib/module-init-tools/kernel-scriptlets/cert-$op --ca-check 1 --certs "$certs" "$@" || script_rc=$? ;; preun) @@ -275,6 +270,7 @@ if test -x /usr/lib/module-init-tools/regenerate-initrd-posttrans; then /bin/bash -c 'set +e; /usr/lib/module-init-tools/regenerate-initrd-posttrans' || script_rc=$? fi + [ ! "$INITRD_IN_POSTTRANS" ] || update_bootloader ;; *) echo Unknown scriptlet "$op" >&2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.32/regenerate-initrd-posttrans new/suse-module-tools-16.0.33/regenerate-initrd-posttrans --- old/suse-module-tools-16.0.32/regenerate-initrd-posttrans 2023-07-03 21:35:50.000000000 +0200 +++ new/suse-module-tools-16.0.33/regenerate-initrd-posttrans 2023-08-15 16:09:18.000000000 +0200 @@ -50,7 +50,7 @@ rm -f "$f" kver=${f##*/} [ -d /lib/modules/"$kver" ] || { - echo $0: skippping invalid kernel version "$dir/$kver" + echo $0: skipping invalid kernel version "$dir/$kver" continue } if ! "$DRACUT" -f --kver "$kver"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.32/suse-module-tools.spec new/suse-module-tools-16.0.33/suse-module-tools.spec --- old/suse-module-tools-16.0.32/suse-module-tools.spec 2023-07-03 21:35:50.000000000 +0200 +++ new/suse-module-tools-16.0.33/suse-module-tools.spec 2023-08-15 16:09:18.000000000 +0200 @@ -15,24 +15,15 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# missing in SLE15 (systemd-rpm-macros) -%{!?_modulesloaddir: %global _modulesloaddir /usr/lib/modules-load.d} - # Location for modprobe and depmod .conf files # # This assumes post-usr-merge (20210527) for Tumbleweed -%if 0%{?suse_version} >= 1550 %global modprobe_dir /usr/lib/modprobe.d %global depmod_dir /usr/lib/depmod.d %global with_kernel_sysctl 1 # boot_sysctl may be dropped on TW when we can assume that nobody keeps # kernel packages around that store sysctl files under /boot %bcond_without boot_sysctl -%else -%global modprobe_dir /lib/modprobe.d -%global depmod_dir /lib/depmod.d -%global with_boot_sysctl 1 -%endif %global sysctl_dropin %{_unitdir}/systemd-sysctl.service.d/50-kernel-uname_r.conf %global systemd_units %{?with_boot_sysctl:boot-sysctl.service} %{?with_kernel_sysctl:kernel-sysctl.service} @@ -45,7 +36,7 @@ %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g') Name: suse-module-tools -Version: 16.0.32 +Version: 16.0.33 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -64,9 +55,6 @@ Requires(post): /usr/bin/grep Requires(post): /usr/bin/sed Requires(post): coreutils -%if 0%{?suse_version} < 1550 -Provides: suse-kernel-rpm-scriptlets = 0 -%endif Provides: udev-extra-rules = 0.3.0 Obsoletes: udev-extra-rules < 0.3.0 Provides: system-tuning-common-SUSE = 0.3.0 @@ -79,9 +67,7 @@ # This release requires the dracut module 90nvdimm Conflicts: dracut < 49.1 # TW: conflict with pre-usrmerge -%if 0%{?suse_version} >= 1550 -Conflicts: filesystem < 15.5-40.2 -%endif +Conflicts: filesystem < 16 %description This package contains helper scripts for KMP installation and @@ -89,7 +75,6 @@ modprobe. -%if 0%{?suse_version} >= 1550 %package scriptlets Summary: Kernel rpm scriptlets Provides: suse-kernel-rpm-scriptlets = 0 @@ -98,7 +83,6 @@ %description scriptlets Scripts called by the SUSE kernel packages on installation -%endif %prep %setup -q @@ -109,20 +93,7 @@ %install install -d -m 755 "%{buildroot}%{modprobe_dir}" install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d" -# keep /etc clean on Tumbleweed -%if 0%{?suse_version} < 1550 -cat > "%{buildroot}%{_sysconfdir}/modprobe.d/README" <<EOF -Local configuration for modprobe(8) -=================================== - -The distribution-provided modprobe configuration files have moved to %{modprobe_dir}. -To modify the configuration, copy files from %{modprobe_dir} to this directory -(%{_sysconfdir}/modprobe.d) and edit them here. - -See also %{modprobe_dir}/README, %{_defaultdocdir}/%{name}/README.md, and the -man page modprobe.d(5). -EOF -%endif + install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/common/*.conf if [ -d modprobe.conf/%{_arch} ]; then install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/%{_arch}/*.conf @@ -142,14 +113,6 @@ install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" install -pm 755 -t "%{buildroot}/usr/lib/module-init-tools/" \ weak-modules2 driver-check.sh unblacklist lsinitrd-quick - -%if 0%{?suse_version} < 1550 -# rpm macros and helper -# The RPM Macros have been moved to the package rpm-config-SUSE after CODE15, thus are no longer -# shipped here -install -d -m 755 "%{buildroot}%{_rpmmacrodir}" -install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" -%endif install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/" install -d -m 755 "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" install -pm 755 "kernel-scriptlets/cert-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" @@ -192,13 +155,12 @@ mkdir -p %{buildroot}%{_defaultlicensedir} -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 for mod in %{fs_blacklist}; do echo "\ # DO NOT EDIT THIS FILE! # # The $mod file system is blacklisted by default because it isn't actively -# supported by SUSE, not well maintained, or may have security vulnerabilites. +# supported by SUSE. blacklist $mod # The filesystem can be un-blacklisted by running \"modprobe $mod\". # See README.md in the %{name} package for details. @@ -206,7 +168,6 @@ " \ >%{buildroot}%{modprobe_dir}/60-blacklist_fs-"$mod".conf done -%endif %pre %service_add_pre %{systemd_units} @@ -259,10 +220,6 @@ %dir %{_sysconfdir}/modprobe.d %{depmod_dir} %dir %{_sysconfdir}/depmod.d -%if 0%{?suse_version} < 1550 -%{_sysconfdir}/modprobe.d/README -%{_rpmmacrodir}/macros.initrd -%endif %{_bindir}/kmp-install %dir /usr/lib/module-init-tools /usr/lib/module-init-tools/driver-check.sh @@ -278,9 +235,7 @@ /usr/lib/systemd/system-generators %endif # -%if 0%{?suse_version} >= 1550 %files scriptlets -%endif /usr/lib/module-init-tools/kernel-scriptlets %changelog ++++++ suse-module-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.IgOf4T/_old 2023-08-16 14:16:59.534933815 +0200 +++ /var/tmp/diff_new_pack.IgOf4T/_new 2023-08-16 14:16:59.538933842 +0200 @@ -1,5 +1,5 @@ name: suse-module-tools -version: 16.0.32 -mtime: 1688412950 -commit: eecfaab275ec7a166a6fefebadd884a0bec0b8e3 +version: 16.0.33 +mtime: 1692108558 +commit: 68458f207a240eccc77fe87f2b947fcd6a01eaa1
