Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2019-09-04 09:03:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Wed Sep 4 09:03:26 2019 rev:75 rq:727275 version:14.434
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2019-08-28 16:01:05.890803964 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new.7948/installation-images.changes
2019-09-04 09:03:28.783037086 +0200
@@ -1,0 +2,14 @@
+Fri Aug 30 13:41:05 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#329
+- handle compressed modules
+- 14.434
+
+--------------------------------------------------------------------
+Fri Aug 30 12:03:52 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#328
+- Speed up fix_perms
+- 14.433
+
+--------------------------------------------------------------------
Old:
----
installation-images-14.432.tar.xz
New:
----
installation-images-14.434.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.2cCaPn/_old 2019-09-04 09:03:29.571036976 +0200
+++ /var/tmp/diff_new_pack.2cCaPn/_new 2019-09-04 09:03:29.583036975 +0200
@@ -599,7 +599,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.432
+Version: 14.434
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.432.tar.xz -> installation-images-14.434.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.432/VERSION
new/installation-images-14.434/VERSION
--- old/installation-images-14.432/VERSION 2019-08-23 10:48:13.000000000
+0200
+++ new/installation-images-14.434/VERSION 2019-08-30 15:41:05.000000000
+0200
@@ -1 +1 @@
-14.432
+14.434
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.432/bin/fix_perms
new/installation-images-14.434/bin/fix_perms
--- old/installation-images-14.432/bin/fix_perms 2019-08-23
10:48:13.000000000 +0200
+++ new/installation-images-14.434/bin/fix_perms 2019-08-30
15:41:05.000000000 +0200
@@ -2,5 +2,5 @@
# fix permissions of all directories
-find $1 -type d -exec chmod a+rx {} \;
-find $1 -type f -exec chmod -st {} \;
+find $1 -type d -exec chmod a+rx {} +
+find $1 -type f -exec chmod -st {} +
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.432/bin/kernel_mods
new/installation-images-14.434/bin/kernel_mods
--- old/installation-images-14.432/bin/kernel_mods 2019-08-23
10:48:13.000000000 +0200
+++ new/installation-images-14.434/bin/kernel_mods 2019-08-30
15:41:05.000000000 +0200
@@ -10,7 +10,7 @@
$archs{$arch} = 1;
for (@files) {
- if(m#^/lib/modules/.*/([^/]+).ko#) {
+ if(m#^/lib/modules/.*/([^/]+)\.ko#) {
$mod->{$1}{$arch} = 1;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.432/bin/mlist2
new/installation-images-14.434/bin/mlist2
--- old/installation-images-14.432/bin/mlist2 2019-08-23 10:48:13.000000000
+0200
+++ new/installation-images-14.434/bin/mlist2 2019-08-30 15:41:05.000000000
+0200
@@ -155,7 +155,7 @@
$l0 = $l[0];
for $m1 (@fname_list) {
$l[0] = $m1;
- if($fname{$l[0]} =~ m#^$l0$#) {
+ if($fname{$l[0]} =~ m#^$l0(?:\.xz)?$#) {
# print "$l0 - $fname{$l[0]} - $l[0]\n";
$all{$l[0]} = 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.432/changelog
new/installation-images-14.434/changelog
--- old/installation-images-14.432/changelog 2019-08-23 10:48:13.000000000
+0200
+++ new/installation-images-14.434/changelog 2019-08-30 15:41:05.000000000
+0200
@@ -1,3 +1,11 @@
+2019-08-30: 14.434
+ - merge gh#openSUSE/installation-images#329
+ - handle compressed modules
+
+2019-08-30: 14.433
+ - merge gh#openSUSE/installation-images#328
+ - Speed up fix_perms
+
2019-08-23: 14.432
- merge gh#openSUSE/installation-images#327
- add all gpio modules (bsc#1145777)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.432/data/base/mlist3
new/installation-images-14.434/data/base/mlist3
--- old/installation-images-14.432/data/base/mlist3 2019-08-23
10:48:13.000000000 +0200
+++ new/installation-images-14.434/data/base/mlist3 2019-08-30
15:41:05.000000000 +0200
@@ -8,13 +8,13 @@
$err = 0;
-for $m (<$modules_dir/*.ko>) {
+for $m (<$modules_dir/*.ko{,.xz}>) {
chomp $m;
chomp(@l = `modinfo -F firmware $m`);
$m =~ s#.*/##;
- $m =~ s#.ko$##;
+ $m =~ s#\.ko(?:\.xz)?$##;
$fw{$m} = [ @l ] if @l;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.432/data/initrd/modules-config.file_list
new/installation-images-14.434/data/initrd/modules-config.file_list
--- old/installation-images-14.432/data/initrd/modules-config.file_list
2019-08-23 10:48:13.000000000 +0200
+++ new/installation-images-14.434/data/initrd/modules-config.file_list
2019-08-30 15:41:05.000000000 +0200
@@ -5,6 +5,6 @@
L boot/System.map* System.map
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 | xargs modinfo >modules.info
+ e find lib/modules/<kernel_ver> -name '*.ko' -o -name '*.ko.xz' | xargs
modinfo >modules.info
r System.map lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.432/data/initrd/scripts/udev_setup
new/installation-images-14.434/data/initrd/scripts/udev_setup
--- old/installation-images-14.432/data/initrd/scripts/udev_setup
2019-08-23 10:48:13.000000000 +0200
+++ new/installation-images-14.434/data/initrd/scripts/udev_setup
2019-08-30 15:41:05.000000000 +0200
@@ -6,7 +6,7 @@
# load some modules before udevd
for i in edd scsi_dh_alua scsi_dh_emc scsi_dh_rdac ; do
- [ -f /modules/$i.ko ] && modprobe $i
+ [ -f /modules/$i.ko -o -f /modules/$i.ko.xz ] && modprobe $i
done
# disable hotplug helper, udevd listens to netlink
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.432/gefrickel
new/installation-images-14.434/gefrickel
--- old/installation-images-14.432/gefrickel 2019-08-23 10:48:13.000000000
+0200
+++ new/installation-images-14.434/gefrickel 2019-08-30 15:41:05.000000000
+0200
@@ -39,7 +39,9 @@
[ -d "$m_dir" ] || err "no kernel module dir"
mkdir -p "b/$m_dir"
for i in loop squashfs lz4_decompress xxhash zstd_decompress; do
- [ -f $m_dir/$i.ko ] && mv $m_dir/$i.ko b/$m_dir
+ for suffix in ko ko.xz; do
+ [ -f $m_dir/$i.$suffix ] && mv $m_dir/$i.$suffix b/$m_dir
+ done
done
mkdir -p a/lib
mv lib/modules a/lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.432/lib/ReadConfig.pm
new/installation-images-14.434/lib/ReadConfig.pm
--- old/installation-images-14.432/lib/ReadConfig.pm 2019-08-23
10:48:13.000000000 +0200
+++ new/installation-images-14.434/lib/ReadConfig.pm 2019-08-30
15:41:05.000000000 +0200
@@ -1299,7 +1299,14 @@
$ConfigData{kernel_img} = $k_images[0];
$ConfigData{kernel_ver} = ReadFile "$k_dir/kernel";
- $ConfigData{module_type} = 'ko';
+
+ my $mod_type = `find $k_dir/rpm/lib/modules/*/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";
+ }
+ chomp $mod_type;
+ $mod_type =~ /\.(ko(?:\.xz)?)$/;
+ $ConfigData{module_type} = $1;
}
# print STDERR "kernel_img = $ConfigData{kernel_img}\n";
@@ -1362,4 +1369,4 @@
}
}
-1;
\ No newline at end of file
+1;
