Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2024-01-19 23:00:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.16006 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Fri Jan 19 23:00:14 2024 rev:200 rq:1139786 version:17.111
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2024-01-15 22:16:53.609704354 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new.16006/installation-images.changes
2024-01-19 23:00:16.917828826 +0100
@@ -1,0 +2,7 @@
+Thu Jan 18 17:23:45 UTC 2024 - [email protected]
+
+- merge gh#openSUSE/installation-images#687
+- use kernel-firmware-all instead of kernel-firmware (bsc#1214789)
+- 17.111
+
+--------------------------------------------------------------------
Old:
----
installation-images-17.110.tar.xz
New:
----
installation-images-17.111.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.AODqKD/_old 2024-01-19 23:00:17.585853245 +0100
+++ /var/tmp/diff_new_pack.AODqKD/_new 2024-01-19 23:00:17.589853392 +0100
@@ -376,7 +376,7 @@
BuildRequires: kernel-default-extra
BuildRequires: kernel-default-optional
%endif
-BuildRequires: kernel-firmware
+BuildRequires: kernel-firmware-all
BuildRequires: kexec-tools
BuildRequires: khmeros-fonts
BuildRequires: kmod-compat
@@ -670,7 +670,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
-Version: 17.110
+Version: 17.111
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-17.110.tar.xz -> installation-images-17.111.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.110/VERSION
new/installation-images-17.111/VERSION
--- old/installation-images-17.110/VERSION 2024-01-15 12:23:23.000000000
+0100
+++ new/installation-images-17.111/VERSION 2024-01-18 18:23:45.000000000
+0100
@@ -1 +1 @@
-17.110
+17.111
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.110/changelog
new/installation-images-17.111/changelog
--- old/installation-images-17.110/changelog 2024-01-15 12:23:23.000000000
+0100
+++ new/installation-images-17.111/changelog 2024-01-18 18:23:45.000000000
+0100
@@ -1,3 +1,7 @@
+2024-01-18: 17.111
+ - merge gh#openSUSE/installation-images#687
+ - use kernel-firmware-all instead of kernel-firmware (bsc#1214789)
+
2024-01-15: 17.110
- merge gh#openSUSE/installation-images#685
- drop finger (bsc#1218794)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.110/data/base/mlist3
new/installation-images-17.111/data/base/mlist3
--- old/installation-images-17.110/data/base/mlist3 2024-01-15
12:23:23.000000000 +0100
+++ new/installation-images-17.111/data/base/mlist3 2024-01-18
18:23:45.000000000 +0100
@@ -26,7 +26,7 @@
for $m (sort keys %fw) {
for $fw (@{$fw{$m}}) {
my $ok = 0;
- for my $f (<$fw_dir/$fw $fw_dir/$kv/$fw>) {
+ for my $f (<$fw_dir/$fw $fw_dir/$kv/$fw $fw_dir/$fw.xz $fw_dir/$kv/$fw.xz
$fw_dir/$fw.zst $fw_dir/$kv/$fw.zst>) {
if(-r $f) {
$f =~ s#^$fw_dir/##;
system "install -m 644 -D '$fw_dir/$f' 'lib/firmware/$f'\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.110/etc/config
new/installation-images-17.111/etc/config
--- old/installation-images-17.110/etc/config 2024-01-15 12:23:23.000000000
+0100
+++ new/installation-images-17.111/etc/config 2024-01-18 18:23:45.000000000
+0100
@@ -45,9 +45,9 @@
; extra firmware packages
[Firmware]
-default = kernel-firmware,adaptec-firmware
-i386 =
kernel-firmware,adaptec-firmware,ipw-firmware,iwl4965-ucode,iwl5000-ucode,atmel-firmware,ralink-firmware
-x86_64 =
kernel-firmware,adaptec-firmware,ipw-firmware,iwl4965-ucode,iwl5000-ucode,atmel-firmware,ralink-firmware
+default = kernel-firmware-all,adaptec-firmware
+i386 =
kernel-firmware-all,adaptec-firmware,ipw-firmware,iwl4965-ucode,iwl5000-ucode,atmel-firmware,ralink-firmware
+x86_64 =
kernel-firmware-all,adaptec-firmware,ipw-firmware,iwl4965-ucode,iwl5000-ucode,atmel-firmware,ralink-firmware
; lib directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.110/lib/ReadConfig.pm
new/installation-images-17.111/lib/ReadConfig.pm
--- old/installation-images-17.110/lib/ReadConfig.pm 2024-01-15
12:23:23.000000000 +0100
+++ new/installation-images-17.111/lib/ReadConfig.pm 2024-01-18
18:23:45.000000000 +0100
@@ -166,7 +166,7 @@
@EXPORT = qw (
$Script $BasePath $LibPath $BinPath $CfgPath $ImagePath $DataPath
$TmpBase %ConfigData ReadFile RealRPM RealRPMs ReadRPM $SUBinary SUSystem
Print2File $MToolsCfg $AutoBuild
- ResolveDeps
+ ResolveDeps CopyRPM
);
use strict 'vars';
@@ -403,6 +403,23 @@
#
+# Unpack rpm_name to target_dir and return path to cache dir or undef if
failed.
+#
+sub CopyRPM
+{
+ my $rpm_name = $_[0];
+ my $target_dir = $_[1];
+
+ my $cache_dir = ReadRPM($rpm_name);
+ if($cache_dir) {
+ system "tar -C '$cache_dir/rpm' -cf - . | tar -C '$target_dir' -xf -";
+ }
+
+ return $cache_dir;
+}
+
+
+#
# Unpack rpm to cache dir and return path to dir or undef if failed.
#
sub ReadRPM
@@ -492,20 +509,35 @@
undef $kv;
}
- UnpackRPM RealRPM("$rpm->{name}-base"), $tdir;
- UnpackRPM RealRPM("$rpm->{name}-extra"), $tdir;
- UnpackRPM RealRPM("$rpm->{name}-optional"), $tdir;
+ CopyRPM "$rpm->{name}-base", $tdir;
+ CopyRPM "$rpm->{name}-extra", $tdir;
+ CopyRPM "$rpm->{name}-optional", $tdir;
my $kmp;
for (split(',', $ConfigData{kmp_list})) {
($kmp = $rpm->{name}) =~ s/^kernel/$_-kmp/;
print "adding kmp $kmp\n";
- UnpackRPM RealRPM($kmp), $tdir;
+ CopyRPM $kmp, $tdir;
}
for (split(',', $ConfigData{fw_list})) {
- print "adding firmware $_\n";
- UnpackRPM RealRPM($_), $tdir;
+ if($_ eq 'kernel-firmware-all') {
+ my $rpm = ReadRPM($_);
+ if($rpm) {
+ my $deps = ReadFile "$rpm/requires";
+ for my $fw (split /\n/, $deps) {
+ if($fw =~ /^(kernel-firmware-\S+)/) {
+ $fw = $1;
+ print "adding firmware $fw\n";
+ CopyRPM $fw, $tdir;
+ }
+ }
+ }
+ }
+ else {
+ print "adding firmware $_\n";
+ CopyRPM $_, $tdir;
+ }
}
# keep it readable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-17.110/obs/installation-images.spec
new/installation-images-17.111/obs/installation-images.spec
--- old/installation-images-17.110/obs/installation-images.spec 2024-01-15
12:23:23.000000000 +0100
+++ new/installation-images-17.111/obs/installation-images.spec 2024-01-18
18:23:45.000000000 +0100
@@ -376,7 +376,7 @@
BuildRequires: kernel-default-extra
BuildRequires: kernel-default-optional
%endif
-BuildRequires: kernel-firmware
+BuildRequires: kernel-firmware-all
BuildRequires: kexec-tools
BuildRequires: khmeros-fonts
BuildRequires: kmod-compat
