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 2024-05-23 15:34:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools" Thu May 23 15:34:16 2024 rev:76 rq:1175930 version:16.0.44 Changes: -------- --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2024-01-31 23:54:07.073785395 +0100 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.24587/suse-module-tools.changes 2024-05-23 15:34:39.538306392 +0200 @@ -1,0 +2,8 @@ +Wed May 22 18:32:42 UTC 2024 - Martin Wilck <[email protected]> + +- Update to version 16.0.44: + * Include unblacklist in initramfs (bsc#1224320) + * regenerate-initrd-posttrans: run update-bootloader --refresh for XEN + (bsc#1223278) + +------------------------------------------------------------------- Old: ---- suse-module-tools-16.0.43.obscpio New: ---- suse-module-tools-16.0.44.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-module-tools.spec ++++++ --- /var/tmp/diff_new_pack.VIzc00/_old 2024-05-23 15:34:40.430338762 +0200 +++ /var/tmp/diff_new_pack.VIzc00/_new 2024-05-23 15:34:40.430338762 +0200 @@ -20,6 +20,7 @@ # This assumes post-usr-merge (20210527) for Tumbleweed %global modprobe_dir /usr/lib/modprobe.d %global depmod_dir /usr/lib/depmod.d +%global dracutlibdir %{_prefix}/lib/dracut %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 @@ -36,7 +37,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.43 +Version: 16.0.44 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -126,6 +127,8 @@ ln -s rpm-script %{buildroot}/usr/lib/module-init-tools/kernel-scriptlets/rpm-$i done +install -d -m 755 %{buildroot}%{dracutlibdir}/dracut.conf.d +install -pm 644 10-unblacklist.conf %{buildroot}%{dracutlibdir}/dracut.conf.d install -d -m 755 "%{buildroot}%{_prefix}/bin" # systemd service(s) to load kernel-specific sysctl settings @@ -232,6 +235,8 @@ %{_unitdir}/systemd-sysctl.service.d %{_modulesloaddir} %{_udevrulesdir} +%dir %{dracutlibdir} +%{dracutlibdir}/dracut.conf.d %ifarch ppc64 ppc64le /usr/lib/systemd/system-generators %endif ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VIzc00/_old 2024-05-23 15:34:40.466340067 +0200 +++ /var/tmp/diff_new_pack.VIzc00/_new 2024-05-23 15:34:40.470340213 +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">2e7447774e720050841ea03eb9f8447191eeffde</param></service></servicedata> + <param name="changesrevision">65af4fbcd4584af98f6ab2f86aa5a17cf02d2b82</param></service></servicedata> (No newline at EOF) ++++++ suse-module-tools-16.0.43.obscpio -> suse-module-tools-16.0.44.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.43/10-unblacklist.conf new/suse-module-tools-16.0.44/10-unblacklist.conf --- old/suse-module-tools-16.0.43/10-unblacklist.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/suse-module-tools-16.0.44/10-unblacklist.conf 2024-05-22 20:30:09.000000000 +0200 @@ -0,0 +1,3 @@ +# We ship modprobe.d files that call unblacklist. +# It's a noop in the initramfs, but it needs to exist. +install_items+=" /usr/lib/module-init-tools/unblacklist " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.43/regenerate-initrd-posttrans new/suse-module-tools-16.0.44/regenerate-initrd-posttrans --- old/suse-module-tools-16.0.43/regenerate-initrd-posttrans 2024-01-12 15:39:13.000000000 +0100 +++ new/suse-module-tools-16.0.44/regenerate-initrd-posttrans 2024-05-22 20:30:09.000000000 +0200 @@ -1,4 +1,8 @@ #!/bin/sh +# Local variables: +# indent-tabs-mode: t +# sh-basic-offset: 8 +# End: # # Packages that install kernels or kernel-modules create a flag # @@ -36,31 +40,47 @@ break done +err=0 +work_done= + if test -e "$dir/all"; then rm "$dir"/* - [ "$SKIP_REGENERATE_INITRD_ALL" = 1 ] || + [ "$SKIP_REGENERATE_INITRD_ALL" = 1 ] || { "$DRACUT" -f --regenerate-all - exit -fi -err=0 -for f in "$dir"/*; do - case $f in - "$dir/*") - [ -e "$f" ] || break;; - esac - rm -f "$f" - kver=${f##*/} - case "$kver" in - vmlinuz-*|image-*|vmlinux-*|linux-*|bzImage-*|uImage-*|Image-*|zImage-*) - kver=${kver#*-} - ;; - esac - [ -d /lib/modules/"$kver" ] || { - echo $0: skipping invalid kernel version "$dir/$kver" - continue + work_done=yes } - if ! "$DRACUT" -f --kver "$kver"; then - err=$? - fi -done +else + for f in "$dir"/*; do + case $f in + "$dir/*") + [ -e "$f" ] || break;; + esac + rm -f "$f" + kver=${f##*/} + case "$kver" in + vmlinuz-*|image-*|vmlinux-*|linux-*|bzImage-*|uImage-*|Image-*|zImage-*) + kver=${kver#*-} + ;; + esac + [ -d /lib/modules/"$kver" ] || { + echo $0: skipping invalid kernel version "$dir/$kver" + continue + } + if ! "$DRACUT" -f --kver "$kver"; then + err=$? + else + work_done=yes + fi + done +fi + +# For XEN/grub2 configurations, make sure the updated initrds are copied +# to the EFI system partition. See /etc/grub.d/20_linux_xen. +# The test for xen*.gz is simplistic but should be correct here. +# 20_linux_xen will apply more sophisticated heuristics to detect XEN. +[ ! "$work_done" ] || [ ! -d /sys/firmware/efi ] || \ + [ ! -x /sbin/update-bootloader ] || \ + [ "$(echo /boot/xen*.gz)" = "/boot/xen*.gz" ] || \ + /sbin/update-bootloader --refresh + exit $err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.43/suse-module-tools.spec new/suse-module-tools-16.0.44/suse-module-tools.spec --- old/suse-module-tools-16.0.43/suse-module-tools.spec 2024-01-12 15:39:13.000000000 +0100 +++ new/suse-module-tools-16.0.44/suse-module-tools.spec 2024-05-22 20:30:09.000000000 +0200 @@ -20,6 +20,7 @@ # This assumes post-usr-merge (20210527) for Tumbleweed %global modprobe_dir /usr/lib/modprobe.d %global depmod_dir /usr/lib/depmod.d +%global dracutlibdir %{_prefix}/lib/dracut %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 @@ -36,7 +37,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.43 +Version: 16.0.44 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -126,6 +127,8 @@ ln -s rpm-script %{buildroot}/usr/lib/module-init-tools/kernel-scriptlets/rpm-$i done +install -d -m 755 %{buildroot}%{dracutlibdir}/dracut.conf.d +install -pm 644 10-unblacklist.conf %{buildroot}%{dracutlibdir}/dracut.conf.d install -d -m 755 "%{buildroot}%{_prefix}/bin" # systemd service(s) to load kernel-specific sysctl settings @@ -232,6 +235,8 @@ %{_unitdir}/systemd-sysctl.service.d %{_modulesloaddir} %{_udevrulesdir} +%dir %{dracutlibdir} +%{dracutlibdir}/dracut.conf.d %ifarch ppc64 ppc64le /usr/lib/systemd/system-generators %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.43/unblacklist new/suse-module-tools-16.0.44/unblacklist --- old/suse-module-tools-16.0.43/unblacklist 2024-01-12 15:39:13.000000000 +0100 +++ new/suse-module-tools-16.0.44/unblacklist 2024-05-22 20:30:09.000000000 +0200 @@ -1,13 +1,19 @@ #! /bin/sh -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2021-2024 SUSE LLC # SPDX-License-Identifier: GPL-2.0-or-later +ME="${0##*/}" +if [ -e /etc/initrd-release ]; then + [ "$RD_DEBUG" != "yes" ] || \ + echo "$ME: called in initramfs for \"$@\" - ignoring" >&2 + exit 0 +fi + # Never unblacklist non-interactively if ! tty -s <&0; then exit 0 fi -ME=$(basename "$0") if [ $UID -ne 0 ]; then echo "$ME: you must be root to run this program" >&2 exit 1 ++++++ suse-module-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.VIzc00/_old 2024-05-23 15:34:40.594344713 +0200 +++ /var/tmp/diff_new_pack.VIzc00/_new 2024-05-23 15:34:40.598344858 +0200 @@ -1,5 +1,5 @@ name: suse-module-tools -version: 16.0.43 -mtime: 1705070353 -commit: 2e7447774e720050841ea03eb9f8447191eeffde +version: 16.0.44 +mtime: 1716402609 +commit: 65af4fbcd4584af98f6ab2f86aa5a17cf02d2b82
