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 2021-08-02 12:04:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Mon Aug 2 12:04:37 2021 rev:139 rq:909460 version:17.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2021-07-05 22:22:41.765853752 +0200
+++ /work/SRC/openSUSE:Factory/.installation-images.new.1899/installation-images.changes 2021-08-02 12:04:55.565657868 +0200
@@ -1,0 +2,15 @@
+Fri Jul 30 15:42:47 UTC 2021 - wfeldt(a)opensuse.org
+
+- merge gh#openSUSE/installation-images#516
+- adobe-sourcesanspro-fonts have their font names changed
+ (bsc#1188927)
+- 17.10
+
+--------------------------------------------------------------------
+Fri Jul 30 12:32:03 UTC 2021 - wfeldt(a)opensuse.org
+
+- merge gh#openSUSE/installation-images#488
+- Find kernel also outside boot (boo#1184804)
+- 17.9
+
+--------------------------------------------------------------------
Old:
----
installation-images-17.8.tar.xz
New:
----
installation-images-17.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.WJNlMs/_old 2021-08-02 12:04:56.165657740 +0200
+++ /var/tmp/diff_new_pack.WJNlMs/_new 2021-08-02 12:04:56.165657740 +0200
@@ -674,7 +674,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
-Version: 17.8
+Version: 17.10
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-17.8.tar.xz -> installation-images-17.10.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/VERSION new/installation-images-17.10/VERSION
--- old/installation-images-17.8/VERSION 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/VERSION 2021-07-30 17:42:47.000000000 +0200
@@ -1 +1 @@
-17.8
+17.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/bin/mlist2 new/installation-images-17.10/bin/mlist2
--- old/installation-images-17.8/bin/mlist2 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/bin/mlist2 2021-07-30 17:42:47.000000000 +0200
@@ -326,7 +326,7 @@
for $f (sort { $fname{$a} cmp $fname{$b} } keys %{$sect{$_}{'a'}}) {
next if $sect{$_}{'r'}{$f};
if($fname{$f}) {
- print W "a /lib/modules/<kernel_ver>/$fname{$f} /modules\n";
+ print W "a <kernel_module_dir>/<kernel_ver>/$fname{$f} /modules\n";
}
}
close W;
@@ -336,7 +336,7 @@
for $f (sort { $fname{$a} cmp $fname{$b} } keys %{$sect{$_}{'a'}}) {
next if $sect{$_}{'r'}{$f};
if($fname{$f}) {
- print W " /lib/modules/<kernel_ver>/$fname{$f}\n";
+ print W " <kernel_module_dir>/<kernel_ver>/$fname{$f}\n";
}
}
close W;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/changelog new/installation-images-17.10/changelog
--- old/installation-images-17.8/changelog 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/changelog 2021-07-30 17:42:47.000000000 +0200
@@ -1,3 +1,12 @@
+2021-07-30: 17.10
+ - merge gh#openSUSE/installation-images#516
+ - adobe-sourcesanspro-fonts have their font names changed
+ (bsc#1188927)
+
+2021-07-30: 17.9
+ - merge gh#openSUSE/installation-images#488
+ - Find kernel also outside boot (boo#1184804)
+
2021-07-05: 17.8
- merge gh#openSUSE/installation-images#515
- etc: update module.config to match 5.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/data/boot/boot.file_list new/installation-images-17.10/data/boot/boot.file_list
--- old/installation-images-17.8/data/boot/boot.file_list 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/data/boot/boot.file_list 2021-07-30 17:42:47.000000000 +0200
@@ -8,7 +8,11 @@
endif
<kernel_rpm>:
- a /boot/<kernel_img> /loader/linux
+ if exists(<kernel_rpm>,/usr/lib/modules/<kernel_ver>/<kernel_img>)
+ a /usr/lib/modules/<kernel_ver>/<kernel_img> /loader/linux
+ else
+ a /boot/<kernel_img> /loader/linux
+ endif
memtest86+:
m /boot/memtest.bin /loader/memtest
@@ -29,7 +33,11 @@
elsif arch eq 'aarch64' || arch eq 'armv7l' || arch eq 'armv6l' || arch eq 'riscv64'
<kernel_rpm>:
- a /boot/<kernel_img> /linux
+ if exists(<kernel_rpm>,/usr/lib/modules/<kernel_ver>/<kernel_img>)
+ a /usr/lib/modules/<kernel_ver>/<kernel_img> /linux
+ else
+ a /boot/<kernel_img> /linux
+ endif
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/data/initrd/kernel.file_list new/installation-images-17.10/data/initrd/kernel.file_list
--- old/installation-images-17.8/data/initrd/kernel.file_list 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/data/initrd/kernel.file_list 2021-07-30 17:42:47.000000000 +0200
@@ -1,2 +1,6 @@
<kernel_rpm>:
- m /boot/<kernel_img> /linux
+ if exists(<kernel_rpm>, /boot/<kernel_img>)
+ m /boot/<kernel_img> /linux
+ else
+ m /usr/lib/modules/<kernel_ver>/<kernel_img> /linux
+ endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/data/initrd/modules-config.file_list new/installation-images-17.10/data/initrd/modules-config.file_list
--- old/installation-images-17.8/data/initrd/modules-config.file_list 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/data/initrd/modules-config.file_list 2021-07-30 17:42:47.000000000 +0200
@@ -1,8 +1,13 @@
<kernel_rpm>:
# generate modules.alias, modules.dep
- L lib .
- L boot/System.map* System.map
+ if exists(<kernel_rpm>, <kernel_module_dir>/<kernel_ver>/System.map)
+ L <kernel_module_dir>/<kernel_ver>/System.map System.map
+ L usr/lib .
+ else
+ L lib .
+ L boot/System.map* System.map
+ endif
e /sbin/depmod -a -b . -F System.map <kernel_ver>
e cp lib/modules/<kernel_ver>/modules.dep .
e find lib/modules/<kernel_ver> -name '*.ko' -o -name '*.ko.xz' | xargs modinfo >modules.info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/data/initrd/modules.file_list new/installation-images-17.10/data/initrd/modules.file_list
--- old/installation-images-17.8/data/initrd/modules.file_list 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/data/initrd/modules.file_list 2021-07-30 17:42:47.000000000 +0200
@@ -11,10 +11,10 @@
L lib/firmware fw
endif
- /lib/modules/<kernel_ver>/modules.order
- e perl -pi -e "s#.*/#initrd/#" lib/modules/<kernel_ver>/modules.order
- /lib/modules/<kernel_ver>/modules.builtin
- e perl -pi -e "s#.*/#initrd/#" lib/modules/<kernel_ver>/modules.builtin
+ <kernel_module_dir>/<kernel_ver>/modules.order
+ e perl -pi -e "s#.*/#initrd/#" ./<kernel_module_dir>/<kernel_ver>/modules.order
+ <kernel_module_dir>/<kernel_ver>/modules.builtin
+ e perl -pi -e "s#.*/#initrd/#" ./<kernel_module_dir>/<kernel_ver>/modules.builtin
x module.help modules/module.config
@@ -57,7 +57,11 @@
endif
# add modules.alias, modules.dep
-L boot/System.map* System.map
+if exists(<kernel_rpm>, usr/lib/modules/<kernel_ver>/System.map)
+ L usr/lib/modules/<kernel_ver>/System.map System.map
+else
+ L boot/System.map* System.map
+endif
e /sbin/depmod -a -b . -F System.map <kernel_ver>
r System.map
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/data/root/root.file_list new/installation-images-17.10/data/root/root.file_list
--- old/installation-images-17.8/data/root/root.file_list 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/data/root/root.file_list 2021-07-30 17:42:47.000000000 +0200
@@ -540,8 +540,15 @@
fbiterm:
/usr/bin/fbiterm
-?adobe-sourcesanspro-fonts:
- /usr/share/fonts/truetype/SourceSansPro-{Regular,Light,Semibold}.otf
+if exists(adobe-sourcesanspro-fonts,/usr/share/fonts/truetype/SourceSansPro-Regular.otf)
+ adobe-sourcesanspro-fonts:
+ /usr/share/fonts/truetype/SourceSansPro-{Regular,Light,Semibold}.otf
+endif
+
+if exists(adobe-sourcesanspro-fonts,/usr/share/fonts/truetype/SourceSans3-Regular.otf)
+ adobe-sourcesanspro-fonts:
+ /usr/share/fonts/truetype/SourceSans3-{Regular,Light,Semibold}.otf
+endif
dejavu-fonts:
/usr/share/fonts/truetype/DejaVuSans*.ttf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/etc/mkinstallinitrd new/installation-images-17.10/etc/mkinstallinitrd
--- old/installation-images-17.8/etc/mkinstallinitrd 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/etc/mkinstallinitrd 2021-07-30 17:42:47.000000000 +0200
@@ -116,9 +116,11 @@
system "cd $kernel_dir/ ; cp -a '$_' $tmp_dir/i/lib/modules/$override/initrd";
}
-die "no kernel symbols\n" unless -f "$kernel_dir/boot/System.map-$opt_kernel-$opt_kernel_style";
+my $system_map = "$kernel_dir/lib/modules/System.map-$opt_kernel-$opt_kernel_style";
+$system_map = "$kernel_dir/boot/System.map-$opt_kernel-$opt_kernel_style" unless -f $system_map;
+die "no kernel symbols\n" unless -f $system_map;
-system "depmod -a -b $tmp_dir/i -F $kernel_dir/boot/System.map-$opt_kernel-$opt_kernel_style $opt_kernel-$opt_kernel_style";
+system "depmod -a -b $tmp_dir/i -F $system_map $opt_kernel-$opt_kernel_style";
system "cp $lib_dir/$opt_style/module.config $tmp_dir/i/modules";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.8/lib/ReadConfig.pm new/installation-images-17.10/lib/ReadConfig.pm
--- old/installation-images-17.8/lib/ReadConfig.pm 2021-07-05 10:10:19.000000000 +0200
+++ new/installation-images-17.10/lib/ReadConfig.pm 2021-07-30 17:42:47.000000000 +0200
@@ -463,13 +463,26 @@
SUSystem "find $tdir -type d -exec chmod a+rx '{}' \\;";
my $kv;
+ my $kmd;
- $kv = <$tdir/lib/modules/*>;
+ for my $p ('', '/usr') {
+ if (-d "$tdir$p/lib/modules") {
+ $kmd = "$p/lib/modules";
+ last;
+ }
+ }
+
+ if (!$kmd) {
+ die "couldn't find module dir in $tdir\n";
+ }
+
+ $kv = <$tdir$kmd/*>;
if(-d $kv) {
$kv =~ s#.*/##;
+ print "writing $kv $kmd to $dir/kernel\n";
open $f, ">$dir/kernel";
- print $f $kv;
+ print $f "$kv $kmd";
close $f;
}
else {
@@ -497,11 +510,11 @@
SUSystem "find $tdir -type d -exec chmod a+rx '{}' \\;";
# if kmp version differs, copy files to real kernel tree
- for (<$tdir/lib/modules/*>) {
+ for (<$tdir$kmd/*>) {
s#.*/##;
next if $_ eq $kv;
print "warning: kmp/firmware version mismatch: $_\n";
- SUSystem "sh -c 'tar -C $tdir/lib/modules/$_ -cf - . | tar -C $tdir/lib/modules/$kv -xf -'";
+ SUSystem "sh -c 'tar -C $tdir$kmd/$_ -cf - . | tar -C $tdir$kmd/$kv -xf -'";
}
}
@@ -550,9 +563,13 @@
chomp @$k_files;
for (@$k_files) {
- s#.*/boot/##;
+ next unless s#.*/boot/##;
next if /autoconf|config|shipped|version/; # skip obvious garbage
- push @k_images, $_ if m#^$ConfigData{kernel_img}#;
+ my ($f, $l) = split(/ /);
+ if($f =~ m#^$ConfigData{kernel_img}#) {
+ $l =~ s#.*/## if ($l);
+ push @k_images, $l?$l:$f;
+ }
}
return @k_images;
@@ -1216,7 +1233,8 @@
my $k_dir = ReadRPM $ConfigData{kernel_rpm};
if($k_dir) {
- my @k_images = KernelImg [ `find $k_dir/rpm/boot -type f` ];
+ my $fn = RealRPM($ConfigData{kernel_rpm})->{file};
+ my @k_images = KernelImg [ `rpm --nosignature -q $fn --qf '[%{FILENAMES} %{FILELINKTOS}\n]' 2>/dev/null` ];
if(!@k_images) {
die "Error: No kernel image identified! (Looking for \"$ConfigData{kernel_img}\".)\n\n";
@@ -1227,11 +1245,13 @@
}
$ConfigData{kernel_img} = $k_images[0];
- $ConfigData{kernel_ver} = ReadFile "$k_dir/kernel";
+ ($ConfigData{kernel_ver}, $ConfigData{kernel_module_dir}) = split(' ', ReadFile "$k_dir/kernel");
+ print "kernel_ver: $ConfigData{kernel_ver}\n";
+ print "kernel_module_dir: $ConfigData{kernel_module_dir}\n";
- my $mod_type = `find $k_dir/rpm/lib/modules/*/kernel/ -type f -name '*.ko*' -print -quit`;
+ my $mod_type = `find $k_dir/rpm$ConfigData{kernel_module_dir}/*/kernel/ -type f -name '*.ko*' -print -quit`;
if (!$mod_type) {
- die "Error: No kernel module found! (Looking for '*.ko*' in '$k_dir/rpm/lib/modules/*/kernel/')\n\n";
+ die "Error: No kernel module found! (Looking for '*.ko*' in '$k_dir/rpm$ConfigData{kernel_module_dir}/*/kernel/')\n\n";
}
chomp $mod_type;
$mod_type =~ /\.(ko(?:\.xz)?)$/;
