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-03-17 17:02:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Fri Mar 17 17:02:25 2023 rev:63 rq:1072149 version:16.0.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2023-02-03 22:21:12.268449371 +0100
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.31432/suse-module-tools.changes
2023-03-17 17:02:53.425249091 +0100
@@ -1,0 +2,7 @@
+Wed Mar 15 15:13:14 UTC 2023 - Martin Wilck <mwi...@suse.com>
+
+- Update to version 16.0.30:
+ * get rid of weak-modules (bsc#1202353)
+ * Remove last mentions of mkinitrd
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-16.0.29.obscpio
New:
----
suse-module-tools-16.0.30.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.y7OCbI/_old 2023-03-17 17:02:54.133252800 +0100
+++ /var/tmp/diff_new_pack.y7OCbI/_new 2023-03-17 17:02:54.141252842 +0100
@@ -45,7 +45,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.29
+Version: 16.0.30
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -89,18 +89,6 @@
modprobe.
-%package legacy
-Summary: Legacy "weak-modules" script for Code10
-Group: System/Base
-Requires: %{name}
-Requires: binutils
-Supplements: dkms
-
-%description legacy
-This package contains the legacy "weak-modules" script for kernel
-module package (KMP) support. It was replaced by "weak-modules2" in
-SLE 11 and later. It is still used by the DKMS module packaging framework.
-
%if 0%{?suse_version} >= 1550
%package scriptlets
Summary: Kernel rpm scriptlets
@@ -150,10 +138,10 @@
install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d"
install -pm 644 "depmod-00-system.conf"
"%{buildroot}%{depmod_dir}/00-system.conf"
-# "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc.
+# "/usr/lib/module-init-tools" name hardcoded in other packages
install -d -m 755 "%{buildroot}/usr/lib/module-init-tools"
install -pm 755 -t "%{buildroot}/usr/lib/module-init-tools/" \
- weak-modules{,2} driver-check.sh unblacklist lsinitrd-quick
+ weak-modules2 driver-check.sh unblacklist lsinitrd-quick
%if 0%{?suse_version} < 1550
# rpm macros and helper
@@ -295,9 +283,4 @@
%endif
/usr/lib/module-init-tools/kernel-scriptlets
-
-%files legacy
-%defattr(-,root,root)
-/usr/lib/module-init-tools/weak-modules
-
%changelog
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.y7OCbI/_old 2023-03-17 17:02:54.177253031 +0100
+++ /var/tmp/diff_new_pack.y7OCbI/_new 2023-03-17 17:02:54.181253052 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/suse-module-tools.git</param>
- <param
name="changesrevision">7f7bbf8676b55996f56dd3f61d52d8a7ec0f4003</param></service></servicedata>
+ <param
name="changesrevision">9d5f54597310c7298e59b08d5305fb9d0c55f8be</param></service></servicedata>
(No newline at EOF)
++++++ suse-module-tools-16.0.29.obscpio -> suse-module-tools-16.0.30.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.29/driver-check.sh
new/suse-module-tools-16.0.30/driver-check.sh
--- old/suse-module-tools-16.0.29/driver-check.sh 2023-02-02
10:30:54.000000000 +0100
+++ new/suse-module-tools-16.0.30/driver-check.sh 2023-03-15
16:08:51.000000000 +0100
@@ -210,7 +210,7 @@
;;
weak-updates/*)
error "$kmp installs modules in weak-updates/ instead
of updates/ or extra/"
- explain "The weak-modules directory is reserved for
automatically generated symlinks"
+ explain "The weak-updates directory is reserved for
automatically generated symlinks"
;;
*)
error "$kmp installs modules in an invalid directory"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.29/kernel-scriptlets/rpm-script
new/suse-module-tools-16.0.30/kernel-scriptlets/rpm-script
--- old/suse-module-tools-16.0.29/kernel-scriptlets/rpm-script 2023-02-02
10:30:54.000000000 +0100
+++ new/suse-module-tools-16.0.30/kernel-scriptlets/rpm-script 2023-03-15
16:08:51.000000000 +0100
@@ -211,11 +211,11 @@
fi
# Add symlinks of compatible modules to
/lib/modules/$krel/weak-updates/,
- # run depmod and mkinitrd
+ # run depmod and dracut
if [ -x $wm2 ]; then
run_wm2 --add-kernel "$kernelrelease"-"$flavor" || script_rc=$?
else
- echo "$wm2 does not exist, please run depmod and mkinitrd manually"
>&2
+ echo "$wm2 does not exist, please run depmod and dracut manually"
>&2
script_rc=1
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.29/suse-module-tools.spec
new/suse-module-tools-16.0.30/suse-module-tools.spec
--- old/suse-module-tools-16.0.29/suse-module-tools.spec 2023-02-02
10:30:54.000000000 +0100
+++ new/suse-module-tools-16.0.30/suse-module-tools.spec 2023-03-15
16:08:51.000000000 +0100
@@ -45,7 +45,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.29
+Version: 16.0.30
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -89,18 +89,6 @@
modprobe.
-%package legacy
-Summary: Legacy "weak-modules" script for Code10
-Group: System/Base
-Requires: %{name}
-Requires: binutils
-Supplements: dkms
-
-%description legacy
-This package contains the legacy "weak-modules" script for kernel
-module package (KMP) support. It was replaced by "weak-modules2" in
-SLE 11 and later. It is still used by the DKMS module packaging framework.
-
%if 0%{?suse_version} >= 1550
%package scriptlets
Summary: Kernel rpm scriptlets
@@ -150,10 +138,10 @@
install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d"
install -pm 644 "depmod-00-system.conf"
"%{buildroot}%{depmod_dir}/00-system.conf"
-# "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc.
+# "/usr/lib/module-init-tools" name hardcoded in other packages
install -d -m 755 "%{buildroot}/usr/lib/module-init-tools"
install -pm 755 -t "%{buildroot}/usr/lib/module-init-tools/" \
- weak-modules{,2} driver-check.sh unblacklist lsinitrd-quick
+ weak-modules2 driver-check.sh unblacklist lsinitrd-quick
%if 0%{?suse_version} < 1550
# rpm macros and helper
@@ -295,9 +283,4 @@
%endif
/usr/lib/module-init-tools/kernel-scriptlets
-
-%files legacy
-%defattr(-,root,root)
-/usr/lib/module-init-tools/weak-modules
-
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.29/weak-modules
new/suse-module-tools-16.0.30/weak-modules
--- old/suse-module-tools-16.0.29/weak-modules 2023-02-02 10:30:54.000000000
+0100
+++ new/suse-module-tools-16.0.30/weak-modules 1970-01-01 01:00:00.000000000
+0100
@@ -1,329 +0,0 @@
-#! /bin/bash
-
-# This script is only needed to uninstall old KMPs when updating
-# SLE10 to SLE11+. weak-modules2 is the script what should be used by new
-# packages
-
-unset LANG LC_ALL LC_COLLATE
-
-NM=
-if command -v nm >/dev/null; then
- NM=nm
-elif command -v eu-nm >/dev/null; then
- NM=eu-nm
-else
- echo "ERROR: nm not found" >&2
- exit 1
-fi
-
-# Check if MODULE is compatible with kernel release KREL.
-module_is_compatible() {
- declare module=$1 krel=$2 module_krel=$(krel_of_module "$module")
-
- if [ ! -e $tmpdir/all-symvers-$krel-$module_krel ]; then
- # Symbols exported by the "new" kernel
- if [ ! -e $tmpdir/symvers-$krel ]; then
- if [ -e /boot/symvers-$krel.gz ]; then
- zcat /boot/symvers-$krel.gz \
- | sed -r -ne 's:^0x0*([0-9a-f]+\t[0-9a-zA-Z_]+)\t.*:\1:p'
- fi > $tmpdir/symvers-$krel
- fi
-
- # Symbols that other add-on modules of the "old" kernel export
- # (and that this module may require)
- if [ ! -e $tmpdir/extra-symvers-$module_krel ]; then
- if [ -e /lib/modules/$module_krel/updates ]; then
- find /lib/modules/$module_krel/updates -name '*.ko' \
- | xargs $NM -B \
- | sed -nre 's:^0*([0-9a-f]+) A __crc_(.*):\1 \2:p'
- fi > $tmpdir/extra-symvers-$module_krel
- fi
-
- sort -u $tmpdir/symvers-$krel $tmpdir/extra-symvers-$module_krel \
- > $tmpdir/all-symvers-$krel-$module_krel
- fi
-
- # If the module does not have modversions enabled, $tmpdir/modvers
- # will be empty.
- /sbin/modprobe --dump-modversions "$module" \
- | sed -r -e 's:^0x0*([0-9a-f]+\t.*):\1:' \
- | sort -u \
- > $tmpdir/modvers
-
- # Only include lines of the second file in the output that don't
- # match lines in the first file. (The default separator is
- # <space>, so we are matching the whole line.)
- join -j 1 -v 2 $tmpdir/all-symvers-$krel-$module_krel \
- $tmpdir/modvers > $tmpdir/join
-
- if [ ! -s $tmpdir/modvers ]; then
- echo "Warning: Module ${module##*/} from kernel $module_krel has no" \
- "modversions, so it cannot be reused for kernel $krel" >&2
- elif [ -s $tmpdir/join ]; then
- [ -n "$verbose" ] &&
- echo "Module ${module##*/} from kernel $module_krel is not compatible" \
- "with kernel $krel in symbols:" $(sed -e 's:.* ::' $tmpdir/join)
- elif [ "$krel" != "$module_krel" ]; then
- [ -n "$verbose" ] &&
- echo "Module ${module##*/} from kernel $module_krel is compatible" \
- "with kernel $krel"
- return 0
- fi
- return 1
-}
-
-# Compute the kernel release of a module.
-krel_of_module() {
- declare module=$1
- set -- $(/sbin/modinfo -F vermagic "$module")
- echo "$1"
-}
-
-# Read a list of modules from standard input, convert the filenames into
-# absolute names, and compute the kernel release of each module.
-read_modules_list() {
- local saved_IFS=$IFS
- IFS=$'\n'
- modules=($(cat))
- IFS=$saved_IFS
-
- for ((n = 0; n < ${#modules[@]}; n++)); do
- if [ ${modules[n]:0:1} != / ]; then
- modules[n]=$PWD/${modules[n]}
- fi
- if [ -f "${modules[n]}" ]; then
- module_krels[n]=$(krel_of_module "${modules[n]}")
- else
- # Try to extract the kernel release from the path
- set -- "${modules[n]#/lib/modules/}"
- module_krels[n]=${1%%/*}
- fi
- done
-}
-
-doit() {
- [ -n "$verbose" ] && echo "$@"
- [ -n "$dry_run" ] || "$@"
-}
-
-usage() {
- cat <<'EOF'
-Usage: ${0##*/} [options] {--add-modules|--remove-modules}
- ${0##*/} [options] {--add-kernel|--remove-kernel} {kernel-release}
-
---add-modules
- Add a list of modules read from standard input. Create
- symlinks in compatible kernel's weak-updates/ directory.
- The list of modules is read from standard input.
-
---remove-modules
- Remove compatibility symlinks from weak-updates/ directories
- for a list of modules. The list of modules is read from
- standard input.
-
---add-kernel
- Add compatibility symlinks for all compatible modules to the
- specified or running kernel.
-
---remove-kernel
- Remove all compatibility symlinks for the specified or current
- kernel.
-
---verbose
- Print the commands executed.
-
--dry-run
- Do not create/remove any files.
-EOF
- exit $1
-}
-
-[ -e /etc/sysconfig/kernel ] && source /etc/sysconfig/kernel
-
-unset ${!changed_modules_*} ${!changed_initrd_*}
-
-module_has_changed() {
- declare module=$1 krel=$2
-
- module=${module%.ko}
- module=${module##*/}
-
- eval "changed_modules_${krel//[^a-zA-Z0-9]/_}=$krel"
- case " $INITRD_MODULES " in
- *" $module "*)
- eval "changed_initrd_${krel//[^a-zA-Z0-9]/_}=$krel"
- ;;
- esac
-}
-
-options=`getopt -o h --long help,add-modules,remove-modules \
- --long add-kernel,remove-kernel,dry-run,verbose -- "$@"`
-
-[ $? -eq 0 ] || usage 1
-
-eval set -- "$options"
-
-while :; do
- case "$1" in
- --add-modules)
- add_modules=1
- ;;
- --remove-modules)
- remove_modules=1
- ;;
- --add-kernel)
- add_kernel=1
- ;;
- --remove-kernel)
- remove_kernel=1
- ;;
- --dry-run)
- dry_run=1
- ;;
- --verbose)
- verbose=1
- ;;
- -h|--help)
- usage 0
- ;;
- --)
- shift
- break
- ;;
- esac
- shift
-done
-
-if [ "$add_modules$remove_modules$add_kernel$remove_kernel" != 1 ]; then
- usage 1
-fi
-if [ -n "$add_kernel" -o -n "$remove_kernel" ]; then
- [ $# -gt 1 ] && usage 1
-else
- [ $# -ne 0 ] && usage 1
-fi
-
-tmpdir=$(mktemp -td ${0##*/}.XXXXXX)
-trap "rm -rf $tmpdir" EXIT
-
-if [ -n "$add_modules" ]; then
- read_modules_list || exit 1
- if [ ${#modules[@]} -gt 0 ]; then
- for krel in $(ls /lib/modules/); do
- [ -e /boot/symvers-$krel.gz ] || continue
- for ((n = 0; n < ${#modules[@]}; n++)); do
- module=${modules[n]}
- module_krel=${module_krels[n]}
- case "$module" in
- /lib/modules/$krel/*)
- continue ;;
- esac
- subpath=${module#/lib/modules/$module_krel/updates}
- weak_module=/lib/modules/$krel/weak-updates/${subpath#/}
- if [ -r "$weak_module" ]; then
- weak_krel=$(krel_of_module "$weak_module")
- if [ "$weak_krel" != "$module_krel" ] &&
- [ "$(printf "%s\n" "$weak_krel" "$module_krel" \
- | /usr/lib/rpm/rpmsort | head -n 1)" = \
- "$module_krel" ]; then
- # Keep modules from more recent kernels.
- [ -n "$verbose" ] && echo \
-"Keeping module ${module##*/} from kernel $weak_krel for kernel $krel"
- continue
- fi
- fi
- if module_is_compatible $module $krel; then
- doit mkdir -p $(dirname $weak_module)
- doit ln -sf $module $weak_module
- module_has_changed $module $krel
- fi
- done
- done
- fi
-elif [ -n "$remove_modules" ]; then
- read_modules_list || exit 1
- if [ ${#modules[@]} -gt 0 ]; then
- krels=($(ls /lib/modules/ | /usr/lib/rpm/rpmsort -r))
- for krel in "${krels[@]}"; do
- [ -e /boot/symvers-$krel.gz ] || continue
- for ((n = 0; n < ${#modules[@]}; n++)); do
- module=${modules[n]}
- [ -e "$module" ] && continue
- module_krel=${module_krels[n]}
- subpath=${module#/lib/modules/$module_krel/updates}
- weak_module=/lib/modules/$krel/weak-updates/${subpath#/}
- if [ "$(readlink "$weak_module")" = "$module" ]; then
- [ -n "$verbose" ] && echo \
-"Removing compatible module ${subpath#/} from kernel $krel"
- doit rm -f "$weak_module"
- for krel2 in "${krels[@]}"; do
- [ -e /boot/symvers-$krel2.gz ] || continue
- module=/lib/modules/$krel2/updates/${subpath#/}
- [ -e "$module" ] || continue
- if module_is_compatible "$module" "$krel2"; then
- [ -n "$verbose" ] && echo \
-"Adding compatible module ${module##*/} from kernel $krel2 instead"
- doit ln -s "$module" "$weak_module"
- break
- fi
- done
- doit rmdir --parents --ignore-fail-on-non-empty \
- "$(dirname "$weak_module")"
- module_has_changed $module $krel
- fi
- done
- done
- fi
-elif [ -n "$add_kernel" ]; then
- add_krel=${1:-$(uname -r)}
- if [ ! -e /boot/symvers-$add_krel.gz ]; then
- echo "Symvers dump file /boot/symvers-$add_krel.gz" \
- "not found" >&2
- exit 1
- fi
- for krel in $(ls /lib/modules/ | /usr/lib/rpm/rpmsort -r); do
- [ "$add_krel" = "$krel" ] && continue
- [ -d /lib/modules/$krel/updates ] || continue
- for module in $(find /lib/modules/$krel/updates -name '*.ko'); do
- subpath=${module#/lib/modules/$krel/updates}
- weak_module=/lib/modules/$add_krel/weak-updates/${subpath#/}
- [ -e "$weak_module" ] && continue
- if module_is_compatible $module $add_krel; then
- doit mkdir -p $(dirname $weak_module)
- doit ln -sf $module $weak_module
- fi
- done
- done
-elif [ -n "$remove_kernel" ]; then
- remove_krel=${1:-$(uname -r)}
- weak_modules=/lib/modules/$remove_krel/weak-updates
- doit rm -rf "$weak_modules"
-fi
-
-for krel in ${!changed_modules_*}; do
- krel=${!krel}
- [ -e /boot/System.map-$krel ] || continue
- /sbin/depmod -ae -F /boot/System.map-$krel $krel
-done
-
-for krel in ${!changed_initrd_*}; do
- krel=${!krel}
- [ -e /boot/System.map-$krel ] || continue
-
- image=
- for x in vmlinuz image vmlinux linux bzImage uImage Image; do
- if [ -f /boot/$x-$krel ]; then
- image=$x
- break
- fi
- done
- if [ -n "$image" ]; then
- if [ -x /sbin/mkinitrd ]; then
- /sbin/mkinitrd -k /boot/$image-$krel -i /boot/initrd-$krel
- else
- echo "Please run mkinitrd as soon as your system is complete." >&2
- fi
- fi
-done
-
-# vim:shiftwidth=4 softtabstop=4
++++++ suse-module-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.y7OCbI/_old 2023-03-17 17:02:54.321253786 +0100
+++ /var/tmp/diff_new_pack.y7OCbI/_new 2023-03-17 17:02:54.321253786 +0100
@@ -1,5 +1,5 @@
name: suse-module-tools
-version: 16.0.29
-mtime: 1675330254
-commit: 7f7bbf8676b55996f56dd3f61d52d8a7ec0f4003
+version: 16.0.30
+mtime: 1678892931
+commit: 9d5f54597310c7298e59b08d5305fb9d0c55f8be
