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 2021-06-21 20:35:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Mon Jun 21 20:35:02 2021 rev:42 rq:900614 version:16.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2021-04-26 16:38:54.902007893 +0200
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.2625/suse-module-tools.changes
2021-06-21 20:35:15.218596255 +0200
@@ -1,0 +2,38 @@
+Thu Jun 17 14:43:13 UTC 2021 - mwi...@suse.com
+
+- Update to version 16.0.4:
+ * re-add legacy subpackage with "weak-modules", and add a
+ "Supplements" dependency on dkms, which needs it
+
+-------------------------------------------------------------------
+Thu Jun 17 13:10:42 UTC 2021 - mwi...@suse.com
+
+- Update to version 16.0.3:
+ * Fix treatment of compressed modules (bsc#1187093)
+
+-------------------------------------------------------------------
+Thu Jun 10 08:41:47 UTC 2021 - mwi...@suse.com
+
+- Update to version 16.0.2:
+ * fix kernel version in dracut invocation (bug in 16.0.0)
+ * spec file: really fix ppc64/ppc64le
+
+-------------------------------------------------------------------
+Thu May 27 19:13:05 UTC 2021 - mwi...@suse.com
+
+- Update to version 16.0.1:
+ * fix ppc64/ppc64le build
+
+-------------------------------------------------------------------
+Thu May 27 09:29:56 UTC 2021 - mwi...@suse.com
+
+- Update to version 16.0.0
+- modprobe.conf cleanup (bsc#1161343)
+ * Unify ppc64 and ppc64le
+ * Delete files for obsolete architectures
+ * Remove obsolete SUSE_INITRD statements (bsc#1161343)
+ * Add dependency on dracut 049.1 (bsc#1142152, ltc#176292, FATE#327775)
+- Replace mkinitrd with dracut everywhere
+- Remove obsolete "weak-modules" script
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-15.4.1.obscpio
New:
----
suse-module-tools-16.0.4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.ZQSsve/_old 2021-06-21 20:35:15.714596723 +0200
+++ /var/tmp/diff_new_pack.ZQSsve/_new 2021-06-21 20:35:15.718596727 +0200
@@ -28,7 +28,7 @@
%endif
Name: suse-module-tools
-Version: 15.4.1
+Version: 16.0.4
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -45,17 +45,13 @@
Requires(post): /usr/bin/grep
Requires(post): /usr/bin/sed
Requires(post): coreutils
-# Use weak dependencies for mkinitrd and kmod in order to
+# Use weak dependencies for dracut and kmod in order to
# keep Ring0 lean. In normal deployments, these packages
# will be available anyway.
-Recommends: mkinitrd
-%if 0%{?suse_version} >= 1315
+Recommends: dracut
Recommends: kmod
-%else
-Recommends: modutils
-%endif
-# This release requires the dracut fix for bsc#1127891
-Conflicts: dracut < 44.2
+# This release requires the dracut module 90nvdimm
+Conflicts: dracut < 49.1
%description
This package contains helper scripts for KMP installation and
@@ -63,16 +59,18 @@
modprobe. These utilities are provided by kmod-compat or
module-init-tools, whichever implementation you choose to install.
+
%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.
+SLE 11 and later. It is still used by the DKMS module packaging framework.
%prep
%setup -q
@@ -82,6 +80,9 @@
%install
# now assemble the parts for modprobe.conf
cp modprobe.conf/modprobe.conf.common 00-system.conf
+%ifarch ppc64le
+ln -f modprobe.conf/modprobe.conf.ppc64 modprobe.conf/modprobe.conf.$RPM_ARCH
+%endif
if [ -f "modprobe.conf/modprobe.conf.$RPM_ARCH" ]; then
cat "modprobe.conf/modprobe.conf.$RPM_ARCH" >>00-system.conf
fi
@@ -127,7 +128,7 @@
# Not needed in SLE11, where sg is loaded via udev rule.
install -d -m 755 "%{buildroot}%{modules_load_dir}"
install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}"
-%ifarch ppc64le
+%ifarch ppc64 ppc64le
install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
install -m 755 udev-trigger-generator
%{buildroot}/usr/lib/systemd/system-generators
%endif
@@ -271,7 +272,7 @@
%{_unitdir}/systemd-sysctl.service.d
%dir %{modules_load_dir}
%{modules_load_dir}/sg.conf
-%ifarch ppc64le
+%ifarch ppc64 ppc64le
/usr/lib/systemd/system-generators
%endif
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ZQSsve/_old 2021-06-21 20:35:15.746596753 +0200
+++ /var/tmp/diff_new_pack.ZQSsve/_new 2021-06-21 20:35:15.746596753 +0200
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
@@ -14,6 +15,7 @@
<param name="files">*/suse-module-tools.spec</param>
<param name="outfilename">suse-module-tools.spec</param>
</service>
+ <service name="set_version" mode="manual"/>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.ZQSsve/_old 2021-06-21 20:35:15.766596772 +0200
+++ /var/tmp/diff_new_pack.ZQSsve/_new 2021-06-21 20:35:15.766596772 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/suse-module-tools.git</param>
- <param
name="changesrevision">f4a9c82b6e4964fed422119264ac944330b68d85</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">fe422e7058c691493567eeffc162f278b2120549</param></service></servicedata>
\ No newline at end of file
++++++ suse-module-tools-15.4.1.obscpio -> suse-module-tools-16.0.4.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.alpha
new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.alpha
--- old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.alpha
2021-04-22 18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.alpha
1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-# begin of alpha part for modprobe.conf
-
-alias char-major-4 serial
-alias char-major-5 serial
-
-alias parport_lowlevel parport_pc
-# disable DMA for parallel port (bnc#180390)
-# Please note, the dma= and irq= options require that the io= option also be
-# specified.
-options parport_pc dma=none
-# options parport_pc io=0x378 irq=none
-# If you have multiple parallel ports, specify them this way:
-# options parport_pc io=0x378,0x278 irq=none,none
-
-# end of alpha part for modprobe.conf
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.common
new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.common
--- old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.common
2021-04-22 18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.common
2021-06-17 16:41:56.000000000 +0200
@@ -55,9 +55,6 @@
# rpc_pipefs
install rpc_pipefs /sbin/modprobe sunrpc
-# we don't want ide-scsi handle CD drives (bnc#242009)
-options ide-scsi idescsi_nocd=1
-
# pata_acpi is useful for certain limited cases but it tries to attach any
# controller with IDE class code causing more harm than good if loaded by
# default. Blacklist it so that it can be used selectively.
@@ -65,24 +62,13 @@
# "Warning! ehci_hcd should always be loaded before uhci_hcd and ohci_hcd, not
# after" (bnc#449853)
-# mkinitrd hints:
-# SUSE INITRD: uhci-hcd REQUIRES ehci-hcd
-# SUSE INITRD: ohci-hcd REQUIRES ehci-hcd
softdep uhci-hcd pre: ehci-hcd
softdep ohci-hcd pre: ehci-hcd
-# libcrc32c calls crypto_alloc_shash("crc32c", 0, 0), which results in a
-# request_module("crc32c"), but that dependency is not seen by modpost/depmod
-# https://bugzilla.novell.com/552443
-# SUSE INITRD: libcrc32c REQUIRES crc32c
-
-# likewise, cifs calls crypto_alloc_shash(...) for a couple of algorithms
-# https://bugzilla.novell.com/730617
-# SUSE INITRD: cifs REQUIRES des ecb md4 md5 hmac arc4
-# It also calls load_nls()
+# cifs calls load_nls()
# FIXME: determine the proper nls module based on fstab options instead
# SUSE INITRD: cifs REQUIRES nls_utf8
-
+
# SCSI changers can take 1h to initialize on module load,
# triggering udev timeouts (bnc#760274).
options ch init=0
@@ -93,7 +79,6 @@
softdep usb_storage post: uas
# bsc#1100989: cxgb4 needs to be loaded before csiostor (Chelsio request)
-# SUSE INITRD: csiostor REQUIRES cxgb4
softdep csiostor pre: cxgb4
# dm-crypt requires essiv
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.ppc
new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.ppc
--- old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.ppc
2021-04-22 18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.ppc
1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-# begin of ppc part for modprobe.conf
-
-install char-major-4 /bin/true
-install char-major-5 /bin/true
-
-install char-major-9 /bin/true
-# alias char-major-9 st
-
-# 206 char OnStream SC-x0 tape devices
-install char-major-206 /bin/true
-
-# 11 block SCSI CD-ROM devices
-install block-major-11 /bin/true
-# alias block-major-11 sr_mod
-
-# 86 char SCSI media changer
-install char-major-86 /bin/true
-
-# the "powerpc32 bash" triggers that one
-install personality-8 /bin/true
-
-# there are not soo many IDE controllers
-install block-major-88 /bin/true
-install block-major-89 /bin/true
-install block-major-90 /bin/true
-install block-major-91 /bin/true
-
-alias parport_lowlevel parport_pc
-# disable DMA for parallel port (bnc#180390)
-# Please note, the dma= and irq= options require that the io= option also be
-# specified.
-options parport_pc dma=none
-# options parport_pc io=0x3bc irq=none
-# If you have multiple parallel ports, specify them this way:
-# options parport_pc io=0x378,0x278 irq=none,none
-
-# firewire modules, spb2 is for FW drives and CD
-install ohci1394 { modprobe ieee1394; } ; /sbin/modprobe
--ignore-install ohci1394
-install sbp2 { modprobe ohci1394; } ; /sbin/modprobe
--ignore-install sbp2
-
-# end of ppc part for modprobe.conf
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.ppc64
new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.ppc64
--- old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.ppc64
1970-01-01 01:00:00.000000000 +0100
+++ new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.ppc64
2021-06-17 16:41:56.000000000 +0200
@@ -0,0 +1,6 @@
+# begin of ppc64/ppc64le part for modprobe.conf
+
+# catas recovery conflicts with eeh (bsc#456389)
+options ib_mthca catas_reset_disable=1
+
+# end of ppc64/ppc64le part for modprobe.conf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.ppc64le
new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.ppc64le
--- old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.ppc64le
2021-04-22 18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.ppc64le
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-# begin of ppc64le part for modprobe.conf
-
-# catas recovery conflicts with eeh (bsc#456389)
-options ib_mthca catas_reset_disable=1
-
-# bsc#1142152 papr_scm requires libnvdimm
-# SUSE INITRD: libnvdimm REQUIRES papr_scm
-
-# end of ppc64le part for modprobe.conf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.s390
new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.s390
--- old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.s390
2021-04-22 18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.s390
1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-# begin of s390 part for modprobe.conf
-
-install char-major-4 /bin/true
-install char-major-5 /bin/true
-
-install net-pf-4 /bin/true
-install net-pf-5 /bin/true
-install net-pf-6 /bin/true
-install net-pf-11 /bin/true
-
-install tty-ldisc-11 /bin/true
-install tty-ldisc-5 /bin/true
-
-alias ctc0 ctc
-alias ctc1 ctc
-alias ctc2 ctc
-alias ctc3 ctc
-alias ctc4 ctc
-alias ctc5 ctc
-alias ctc6 ctc
-alias ctc7 ctc
-alias escon0 ctc
-alias escon1 ctc
-alias escon2 ctc
-alias escon3 ctc
-alias escon4 ctc
-alias escon5 ctc
-alias escon6 ctc
-alias escon7 ctc
-alias iucv0 netiucv
-alias iucv1 netiucv
-alias iucv2 netiucv
-alias iucv3 netiucv
-alias iucv4 netiucv
-alias iucv5 netiucv
-alias iucv6 netiucv
-alias iucv7 netiucv
-alias iucv8 netiucv
-alias iucv9 netiucv
-
-alias block-major-35 xpram
-
-# The framebuffer console is built as a module on s390, because it is
-# useful only to a KVM guest. But then it should be loaded together
-# with the corresponding DRM driver.
-# SUSE INITRD: virtio_gpu REQUIRES fbcon
-softdep virtio_gpu post: fbcon
-
-# end of s390 part for modprobe.conf
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.sparc
new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.sparc
--- old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.sparc
2021-04-22 18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.sparc
1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-# begin of sparc part for modprobe.conf
-
-install char-major-4 /bin/true
-install char-major-5 /bin/true
-
-alias parport_lowlevel parport_pc
-# disable DMA for parallel port (bnc#180390)
-# Please note, the dma= and irq= options require that the io= option also be
-# specified.
-options parport_pc dma=none
-
-# end of sparc part for modprobe.conf
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.sparc64
new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.sparc64
--- old/suse-module-tools-15.4.1/modprobe.conf/modprobe.conf.sparc64
2021-04-22 18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/modprobe.conf/modprobe.conf.sparc64
1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-# begin of sparc64 part for modprobe.conf
-
-install char-major-4 /bin/true
-install char-major-5 /bin/true
-
-alias parport_lowlevel parport_pc
-# disable DMA for parallel port (bnc#180390)
-# Please note, the dma= and irq= options require that the io= option also be
-# specified.
-options parport_pc dma=none
-
-# end of sparc64 part for modprobe.conf
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.4.1/regenerate-initrd-posttrans
new/suse-module-tools-16.0.4/regenerate-initrd-posttrans
--- old/suse-module-tools-15.4.1/regenerate-initrd-posttrans 2021-04-22
18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/regenerate-initrd-posttrans 2021-06-17
16:41:56.000000000 +0200
@@ -13,27 +13,21 @@
shopt -s nullglob
-dir=/run/regenerate-initrd
-
-did_mkinitrd_setup=false
-run_mkinitrd_setup()
-{
- if ! $did_mkinitrd_setup; then
- if test -x /sbin/mkinitrd_setup; then
- /sbin/mkinitrd_setup
- fi
- did_mkinitrd_setup=true
- fi
-}
+: ${DRACUT:=/usr/bin/dracut}
+if [[ ! -x "$DRACUT" ]]; then
+ echo "ERROR: $DRACUT not found" >&2
+ exit 1
+fi
+dir=/run/regenerate-initrd
if ! test -d "$dir"; then
exit 0
fi
for f in "$dir"/*; do
# check if we are in a build chroot
- if ! [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then
- echo "Please run mkinitrd as soon as your system is complete."
>&2
+ if ! [ -f /etc/fstab -a ! -e /.buildenv -a -x "$DRACUT" ] ; then
+ echo "Please run \"$DRACUT -f --regenerate-all\" as soon as
your system is complete." >&2
rm "$dir"/*
exit 0
fi
@@ -42,21 +36,19 @@
if test -e "$dir/all"; then
rm "$dir"/*
- run_mkinitrd_setup
- /sbin/mkinitrd
+ "$DRACUT" -f --regenerate-all
exit
fi
err=0
for f in "$dir"/*; do
rm "$f"
image=${f##*/}
- initrd=initrd-${image#*-}
+ kver=${image#*-}
if ! test -e "/boot/$image"; then
echo "$0: /boot/$image does not exist, initrd won't be
generated"
continue
fi
- run_mkinitrd_setup
- if ! /sbin/mkinitrd -k "/boot/$image" -i "/boot/$initrd"; then
+ if ! "$DRACUT" -f "/boot/initrd-$kver" "$kver"; then
err=$?
fi
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.4.1/suse-module-tools.spec
new/suse-module-tools-16.0.4/suse-module-tools.spec
--- old/suse-module-tools-15.4.1/suse-module-tools.spec 2021-04-22
18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/suse-module-tools.spec 2021-06-17
16:41:56.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package suse-module-tools
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
%endif
Name: suse-module-tools
-Version: 15.4.1
+Version: 16.0.4
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -45,17 +45,13 @@
Requires(post): /usr/bin/grep
Requires(post): /usr/bin/sed
Requires(post): coreutils
-# Use weak dependencies for mkinitrd and kmod in order to
+# Use weak dependencies for dracut and kmod in order to
# keep Ring0 lean. In normal deployments, these packages
# will be available anyway.
-Recommends: mkinitrd
-%if 0%{?suse_version} >= 1315
+Recommends: dracut
Recommends: kmod
-%else
-Recommends: modutils
-%endif
-# This release requires the dracut fix for bsc#1127891
-Conflicts: dracut < 44.2
+# This release requires the dracut module 90nvdimm
+Conflicts: dracut < 49.1
%description
This package contains helper scripts for KMP installation and
@@ -69,11 +65,12 @@
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.
+SLE 11 and later. It is still used by the DKMS module packaging framework.
%prep
%setup -q
@@ -83,6 +80,9 @@
%install
# now assemble the parts for modprobe.conf
cp modprobe.conf/modprobe.conf.common 00-system.conf
+%ifarch ppc64le
+ln -f modprobe.conf/modprobe.conf.ppc64 modprobe.conf/modprobe.conf.$RPM_ARCH
+%endif
if [ -f "modprobe.conf/modprobe.conf.$RPM_ARCH" ]; then
cat "modprobe.conf/modprobe.conf.$RPM_ARCH" >>00-system.conf
fi
@@ -128,7 +128,7 @@
# Not needed in SLE11, where sg is loaded via udev rule.
install -d -m 755 "%{buildroot}%{modules_load_dir}"
install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}"
-%ifarch ppc64le
+%ifarch ppc64 ppc64le
install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
install -m 755 udev-trigger-generator
%{buildroot}/usr/lib/systemd/system-generators
%endif
@@ -272,7 +272,7 @@
%{_unitdir}/systemd-sysctl.service.d
%dir %{modules_load_dir}
%{modules_load_dir}/sg.conf
-%ifarch ppc64le
+%ifarch ppc64 ppc64le
/usr/lib/systemd/system-generators
%endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.4.1/udev-trigger-generator
new/suse-module-tools-16.0.4/udev-trigger-generator
--- old/suse-module-tools-15.4.1/udev-trigger-generator 2021-04-22
18:19:02.000000000 +0200
+++ new/suse-module-tools-16.0.4/udev-trigger-generator 2021-06-17
16:41:56.000000000 +0200
@@ -13,7 +13,7 @@
export TMPDIR=/dev/shm
trap 'echo $0: error in "$BASH_COMMAND" >&2' ERR
-[[ $(uname -m) = ppc64le ]] || exit 0
+[[ $(uname -m) = ppc64le ]] || [[ $(uname -m) = ppc64 ]] || exit 0
case $(systemd-detect-virt) in
none|powervm) ;;
*) exit 0;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.4.1/weak-modules2
new/suse-module-tools-16.0.4/weak-modules2
--- old/suse-module-tools-15.4.1/weak-modules2 2021-04-22 18:19:02.000000000
+0200
+++ new/suse-module-tools-16.0.4/weak-modules2 2021-06-17 16:41:56.000000000
+0200
@@ -56,6 +56,8 @@
# kmps: list of kmps, newest first
#
+: ${DRACUT:=/usr/bin/dracut}
+
find_depmod() {
local _d
@@ -91,8 +93,8 @@
fi
}
-filter_basenames() {
- sed -rn 's:.*\<lib/modules/.*/([^/]*\.ko(\.[gx]z)?)$:\1:p'
+strip_mod_extensions() {
+ sed -rn 's/\.ko(\.[gx]z)?$//p'
}
# Name of the symlink that makes a module available to a given kernel
@@ -319,11 +321,21 @@
xz -cd "$file"
}
-# test if mkinitrd is needed for $krel.
+get_initrd_basenames() {
+ lsinitrd /boot/initrd-$1 | \
+ sed -rn 's:.*\<lib/modules/.*/::p' | \
+ strip_mod_extensions
+
+ INITRD_MODULES=
+ . /etc/sysconfig/kernel &>/dev/null
+ printf '%s\n' $INITRD_MODULES
+}
+
+# test if rebuilding initrd is needed for $krel.
# stdin - list of changed modules ("_kernel_" for the whole kernel)
-needs_mkinitrd() {
+needs_initrd() {
local krel=$1
- local changed_basenames=($(sort -u))
+ local changed_basenames=($(strip_mod_extensions | sort -u))
# Don't generate an initrd for kdump here. It's done automatically with
mkdumprd when
# /etc/init.d/boot.kdump is called to load the kdump kernel. See
mkdumprd(8) why
@@ -332,11 +344,11 @@
return 1
fi
- if ! [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then
- echo "Please run mkinitrd as soon as your system is complete." >&2
+ if ! [ -f /etc/fstab -a ! -e /.buildenv -a -x "$DRACUT" ] ; then
+ echo "Please run \"$DRACUT -f /boot/initrd-$krel $krel\" as soon as
your system is complete." >&2
return 1
fi
- # KMPs can force mkinitrd run with %kernel_module_package -b that sets
+ # KMPs can force initrd rebuild with %kernel_module_package -b that sets
# this variable
if test -n "$KMP_NEEDS_MKINITRD" && \
! test "$KMP_NEEDS_MKINITRD" -eq 0 2>/dev/null; then
@@ -348,7 +360,7 @@
if [ ! -e /boot/initrd-$krel ]; then
return 0
fi
- local initrd_basenames=($( (lsinitrd /boot/initrd-$krel |
filter_basenames; INITRD_MODULES=; . /etc/sysconfig/kernel &>/dev/null; printf
'%s.ko\n' $INITRD_MODULES) | sort -u))
+ local initrd_basenames=($(get_initrd_basenames "$krel" | sort -u))
local i=($(join <(printf '%s\n' "${changed_basenames[@]}") \
<(printf '%s\n' "${initrd_basenames[@]}") ))
log "changed initrd modules for kernel $krel: ${i[@]-none}"
@@ -358,16 +370,16 @@
return 1
}
-# run depmod and mkinitrd for kernel version $krel
+# run depmod and rebuild initrd for kernel version $krel
# stdin - list of changed modules ("_kernel_" for a whole kernel)
-run_depmod_and_mkinitrd() {
+run_depmod_build_initrd() {
local krel=$1
local status=0
if [ -d /lib/modules/$krel -a -f /boot/System.map-$krel ] ; then
doit "$DEPMOD" -F /boot/System.map-$krel -ae $krel || return 1
fi
- if needs_mkinitrd $krel; then
+ if needs_initrd $krel; then
local image
for x in vmlinuz image vmlinux linux bzImage uImage Image zImage; do
if [ -f /boot/$x-$krel ]; then
@@ -380,15 +392,8 @@
mkdir -p /run/regenerate-initrd
touch /run/regenerate-initrd/$image-$krel
else
- doit /sbin/mkinitrd -k /boot/$image-$krel -i /boot/initrd-$krel
+ doit "$DRACUT" -f /boot/initrd-$krel $krel
status=$?
- # mkinitrd fails with status 10 if any required kernel modules
- # missing. We expect those modules to be added later (by one of
- # the other kernel-$flavor packages).
- if [ $status -eq 10 ]; then
- log "mkinitrd failed with status 10 (module missing),
proceeding"
- status=0
- fi
fi
else
echo "WARNING: kernel image for $krel not found!" >&2
@@ -405,9 +410,9 @@
return 0
fi
if [ ! -d /lib/modules/$krel ]; then
- # a kernel without modules - run mkinitrd nevertheless (to mount the
+ # a kernel without modules - rebuild initrd nevertheless (to mount the
# root fs, etc).
- echo "_kernel_" | run_depmod_and_mkinitrd "$krel"
+ echo "_kernel_" | run_depmod_build_initrd "$krel"
return
fi
@@ -443,7 +448,7 @@
done
[ -n "$added" -a -n "$skipped" ] || break
done
- echo "_kernel_" | run_depmod_and_mkinitrd "$krel"
+ echo "_kernel_" | run_depmod_build_initrd "$krel"
}
add_kernel() {
@@ -502,7 +507,7 @@
if kmp_is_present $kmp $krel; then
log "Package $kmp does not need to be added to kernel $krel"
- run_depmod_and_mkinitrd "$krel" <$tmpdir/basenames-$kmp || \
+ run_depmod_build_initrd "$krel" <$tmpdir/basenames-$kmp || \
status=1
continue
fi
@@ -512,12 +517,12 @@
add_kmp_modules "$kmp" "$krel"
if [ -z "$old_kmp" ]; then
log "Package $kmp added to kernel $krel"
- run_depmod_and_mkinitrd "$krel" <$tmpdir/basenames-$kmp || \
+ run_depmod_build_initrd "$krel" <$tmpdir/basenames-$kmp || \
status=1
else
log "Package $old_kmp replaced by package $kmp in kernel $krel"
cat $tmpdir/basenames-{$old_kmp,$kmp} \
- | run_depmod_and_mkinitrd "$krel" || status=1
+ | run_depmod_build_initrd "$krel" || status=1
fi
fi
done
@@ -571,7 +576,7 @@
if [ -n "$other_kmp" ]; then
log "Package $kmp replaced by package $other_kmp in kernel
$krel"
cat $tmpdir/basenames-{$kmp,$other_kmp} \
- | run_depmod_and_mkinitrd "$krel" || status=1
+ | run_depmod_build_initrd "$krel" || status=1
else
log "Package $kmp removed from kernel $krel"
if [ $other_found -eq 1 ]; then
@@ -582,7 +587,7 @@
cat $tmpdir/unresolved-"$krel"
fi
fi
- run_depmod_and_mkinitrd "$krel" <$tmpdir/basenames-$kmp || \
+ run_depmod_build_initrd "$krel" <$tmpdir/basenames-$kmp || \
status=1
fi
rm -f $tmpdir/unresolved-"$krel"
@@ -595,19 +600,19 @@
cat <<EOF
${0##*/} --add-kmp kmp-name-version-release
To be called in %post of kernel module packages. Creates
- symlinks in compatible kernel's weak-updates/ directory and runs
- mkinitrd if needed.
+ symlinks in compatible kernel's weak-updates/ directory and rebuilds
+ the initrd if needed.
${0##*/} --remove-kmp kmp-name < module-list
To be called in %postun of kernel module packages. Removes
weak-updates/ symlinks for this KMP. As the KMP doesn't exist in
the RPM database at this point, the list of modules has to be
- passed on standard input. Runs mkinitrd if needed.
+ passed on standard input. Rebuilds the initrd if needed.
${0##*/} --add-kernel kernel-release
To be called in %post of the kernel base package. Adds
- compatibility symlinks for all compatible KMPs and runs mkinitrd
- if needed.
+ compatibility symlinks for all compatible KMPs and rebuilds the
+ initrd if needed.
${0##*/} --remove-kernel kernel-release
To be called in %postun of the kernel base package. Removes all
@@ -616,12 +621,12 @@
${0##*/} --add-kernel-modules kernel-release < module-list
To be called in %post of kernel subpackages that only contain
modules (i.e. not kernel-*-base). Adds newly available
- compatibity symlinks and runs mkinitrd if needed.
+ compatibity symlinks and rebuilds the initrd if needed.
${0##*/} --remove-kernel-modules kernel-release < module-list
To be called in %postun of kernel subpackages that only contain
modules (i.e. not kernel-*-base). Removes no longer working
- compatibity symlinks and runs mkinitrd if needed.
+ compatibity symlinks and rebuilds the initrd if needed.
${0##*/} --verbose ...
Print commands as they are executed and other information.
++++++ suse-module-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.ZQSsve/_old 2021-06-21 20:35:15.874596874 +0200
+++ /var/tmp/diff_new_pack.ZQSsve/_new 2021-06-21 20:35:15.874596874 +0200
@@ -1,5 +1,5 @@
name: suse-module-tools
-version: 15.4.1
-mtime: 1619108342
-commit: f4a9c82b6e4964fed422119264ac944330b68d85
+version: 16.0.4
+mtime: 1623940916
+commit: fe422e7058c691493567eeffc162f278b2120549
++++++ suse-module-tools.rpmlintrc ++++++
--- /var/tmp/diff_new_pack.ZQSsve/_old 2021-06-21 20:35:15.890596889 +0200
+++ /var/tmp/diff_new_pack.ZQSsve/_new 2021-06-21 20:35:15.894596893 +0200
@@ -1,2 +1,3 @@
# The package installs different configs for different architectures
addFilter("no-binary");
+
