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-04-29 01:36:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Thu Apr 29 01:36:39 2021 rev:132 rq:888763 version:17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2021-04-23 17:50:49.406814579 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new.12324/installation-images.changes
2021-04-29 01:37:05.222466745 +0200
@@ -1,0 +2,28 @@
+Tue Apr 27 11:02:18 UTC 2021 - [email protected]
+
+- merge gh#openSUSE/installation-images#498
+- rescue: make sure /var/run is a link to /run
+- rescue: link modules and firmware from correct location
+- 17.0
+
+--------------------------------------------------------------------
+Tue Apr 27 06:39:25 UTC 2021 - [email protected]
+
+- merge gh#openSUSE/installation-images#504
+- no more libstoragemgmt-netapp-plugin
+- 16.74
+
+--------------------------------------------------------------------
+Mon Apr 26 15:53:10 UTC 2021 - [email protected]
+
+- merge gh#openSUSE/installation-images#503
+- make usrmerge case depend on /lib link in filesystem package
+- 16.73
+
+--------------------------------------------------------------------
+Mon Apr 26 15:30:35 UTC 2021 - [email protected]
+
+- merge gh#openSUSE/installation-images#502
+- extend 'exists' operator to test for a specfic type
+
+--------------------------------------------------------------------
Old:
----
installation-images-16.72.tar.xz
New:
----
installation-images-17.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.SPTk6h/_old 2021-04-29 01:37:05.834467612 +0200
+++ /var/tmp/diff_new_pack.SPTk6h/_new 2021-04-29 01:37:05.838467618 +0200
@@ -650,7 +650,6 @@
BuildRequires: grub2-riscv64-efi
%endif
# inst-sys module for libstoragemgmt
-BuildRequires: libstoragemgmt-netapp-plugin
BuildRequires: libstoragemgmt-smis-plugin
# our images are not reproducible and it's taking time
#!BuildIgnore: build-compare
@@ -673,7 +672,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
-Version: 16.72
+Version: 17.0
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-16.72.tar.xz -> installation-images-17.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.72/VERSION
new/installation-images-17.0/VERSION
--- old/installation-images-16.72/VERSION 2021-04-23 13:38:05.000000000
+0200
+++ new/installation-images-17.0/VERSION 2021-04-27 13:02:18.000000000
+0200
@@ -1 +1 @@
-16.72
+17.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.72/changelog
new/installation-images-17.0/changelog
--- old/installation-images-16.72/changelog 2021-04-23 13:38:05.000000000
+0200
+++ new/installation-images-17.0/changelog 2021-04-27 13:02:18.000000000
+0200
@@ -1,3 +1,18 @@
+2021-04-27: 17.0
+ - merge gh#openSUSE/installation-images#498
+ - rescue: make sure /var/run is a link to /run
+ - rescue: link modules and firmware from correct location
+
+2021-04-27: 16.74
+ - merge gh#openSUSE/installation-images#504
+ - no more libstoragemgmt-netapp-plugin
+
+2021-04-26: 16.73
+ - merge gh#openSUSE/installation-images#502
+ - extend 'exists' operator to test for a specfic type
+ - merge gh#openSUSE/installation-images#503
+ - make usrmerge case depend on /lib link in filesystem package
+
2021-04-23: 16.72
- merge gh#openSUSE/installation-images#500
- fix NVMf autoconnect udev rule (bsc#1184908)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.72/data/base/base.file_list
new/installation-images-17.0/data/base/base.file_list
--- old/installation-images-16.72/data/base/base.file_list 2021-04-23
13:38:05.000000000 +0200
+++ new/installation-images-17.0/data/base/base.file_list 2021-04-27
13:02:18.000000000 +0200
@@ -3,8 +3,8 @@
if exists(filesystem, usr/lib64)
d usr/lib64
endif
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
+# filesystem has /lib link in usrmerged case
+if exists(filesystem, /lib, l)
s usr/bin /bin
s usr/sbin /sbin
s usr/lib /lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.72/data/initrd/initrd.file_list
new/installation-images-17.0/data/initrd/initrd.file_list
--- old/installation-images-16.72/data/initrd/initrd.file_list 2021-04-23
13:38:05.000000000 +0200
+++ new/installation-images-17.0/data/initrd/initrd.file_list 2021-04-27
13:02:18.000000000 +0200
@@ -4,8 +4,8 @@
if exists(filesystem, usr/lib64)
d usr/lib64
endif
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
+# filesystem has /lib link in usrmerged case
+if exists(filesystem, /lib, l)
s usr/bin /bin
s usr/sbin /sbin
s usr/lib /lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.72/data/initrd/modules.file_list
new/installation-images-17.0/data/initrd/modules.file_list
--- old/installation-images-16.72/data/initrd/modules.file_list 2021-04-23
13:38:05.000000000 +0200
+++ new/installation-images-17.0/data/initrd/modules.file_list 2021-04-27
13:02:18.000000000 +0200
@@ -4,8 +4,8 @@
<kernel_rpm>:
- # temporary
- if exists(compat-usrmerge-tools)
+ # temporary: usrmerge
+ if exists(filesystem, /lib, l)
L usr/lib/firmware fw
else
L lib/firmware fw
@@ -61,8 +61,8 @@
e /sbin/depmod -a -b . -F System.map <kernel_ver>
r System.map
-# copy needed firmware files
-if exists(compat-usrmerge-tools)
+# usrmerge: copy needed firmware files
+if exists(filesystem, /lib, l)
d usr/lib/firmware
else
d lib/firmware
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.72/data/initrd/scripts/prepare_rescue
new/installation-images-17.0/data/initrd/scripts/prepare_rescue
--- old/installation-images-16.72/data/initrd/scripts/prepare_rescue
2021-04-23 13:38:05.000000000 +0200
+++ new/installation-images-17.0/data/initrd/scripts/prepare_rescue
2021-04-27 13:02:18.000000000 +0200
@@ -33,6 +33,20 @@
fi
done
+# /var/run needs to be a link
+rm -rf /var/run
+ln -s ../run /var/run
+
+lib=/lib
+if [ -L "$lib" ]; then
+ lib=/usr/$lib
+else
+ mkdir -p "$lib"
+fi
+for i in modules firmware; do
+ ln -sf /parts/mp_0000$lib/$i $lib/$i
+done
+
if [ -f /mounts/initrd/etc/suse-blinux.conf ] ; then
grep -q '^brlname=none' /mounts/initrd/etc/suse-blinux.conf || {
cp /mounts/initrd/etc/suse-blinux.conf /etc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.72/data/rescue/rescue.file_list
new/installation-images-17.0/data/rescue/rescue.file_list
--- old/installation-images-16.72/data/rescue/rescue.file_list 2021-04-23
13:38:05.000000000 +0200
+++ new/installation-images-17.0/data/rescue/rescue.file_list 2021-04-27
13:02:18.000000000 +0200
@@ -5,8 +5,8 @@
if exists(filesystem, usr/lib64)
d usr/lib64
endif
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
+# filesystem has /lib link in usrmerged case
+if exists(filesystem, /lib, l)
s usr/bin /bin
s usr/sbin /sbin
s usr/lib /lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.72/data/root/libstoragemgmt.file_list
new/installation-images-17.0/data/root/libstoragemgmt.file_list
--- old/installation-images-16.72/data/root/libstoragemgmt.file_list
2021-04-23 13:38:05.000000000 +0200
+++ new/installation-images-17.0/data/root/libstoragemgmt.file_list
2021-04-27 13:02:18.000000000 +0200
@@ -2,7 +2,6 @@
/
libstoragemgmt:
-libstoragemgmt-netapp-plugin:
libstoragemgmt-smis-plugin:
AUTODEPS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.72/data/root/root.file_list
new/installation-images-17.0/data/root/root.file_list
--- old/installation-images-16.72/data/root/root.file_list 2021-04-23
13:38:05.000000000 +0200
+++ new/installation-images-17.0/data/root/root.file_list 2021-04-27
13:02:18.000000000 +0200
@@ -4,8 +4,8 @@
if exists(filesystem, usr/lib64)
d usr/lib64
endif
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
+# filesystem has /lib link in usrmerged case
+if exists(filesystem, /lib, l)
s usr/bin /bin
s usr/sbin /sbin
s usr/lib /lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.72/data/root/zenroot.file_list
new/installation-images-17.0/data/root/zenroot.file_list
--- old/installation-images-16.72/data/root/zenroot.file_list 2021-04-23
13:38:05.000000000 +0200
+++ new/installation-images-17.0/data/root/zenroot.file_list 2021-04-27
13:02:18.000000000 +0200
@@ -5,8 +5,8 @@
if exists(filesystem, usr/lib64)
d usr/lib64
endif
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
+# filesystem has /lib link in usrmerged case
+if exists(filesystem, /lib, l)
s usr/bin /bin
s usr/sbin /sbin
s usr/lib /lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.72/doc/files.md
new/installation-images-17.0/doc/files.md
--- old/installation-images-16.72/doc/files.md 2021-04-23 13:38:05.000000000
+0200
+++ new/installation-images-17.0/doc/files.md 2021-04-27 13:02:18.000000000
+0200
@@ -79,7 +79,8 @@
variables. The only exceptions to this are `abuild` and `arch`.
Also, you can use `exists(PACKAGE)` to test for a specific package or
-`exists(PACKAGE, FILE)` to test for a file in a package.
+`exists(PACKAGE, FILE)` to test for a file in a package or
+`exists(PACKAGE, FILE, TYPE)` to test for a file of a specific type.
Note that the test for `FILE` is made in the unpacked rpm stored in the
internal cache. So unless it's an absolute path you can walk out of the root
@@ -108,6 +109,11 @@
# ...
endif
+# only if package foo has a link /usr/bin/bar
+if exists(foo, usr/bin/bar, l)
+# ...
+endif
+
# only if package foo has a postin script
if exists(foo, ../postin)
# ...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.72/lib/AddFiles.pm
new/installation-images-17.0/lib/AddFiles.pm
--- old/installation-images-16.72/lib/AddFiles.pm 2021-04-23
13:38:05.000000000 +0200
+++ new/installation-images-17.0/lib/AddFiles.pm 2021-04-27
13:02:18.000000000 +0200
@@ -942,13 +942,16 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Check if an rpm contains a file.
#
-# rpm_has_file(rpm, file)
+# rpm_has_file(rpm, file, type)
#
# If file is missing, verifies only existence of rpm.
+# If type is specified, types must match.
+#
+# type is perl's -X operator (without the '-').
#
sub rpm_has_file
{
- my ($rpm, $file) = @_;
+ my ($rpm, $file, $type) = @_;
return 0 if !RealRPM $rpm;
@@ -958,7 +961,9 @@
return 0 if !$rpm_dir;
- return -e "$rpm_dir/rpm/$file";
+ $type = 'e' if !$type;
+
+ return eval "-$type \"$rpm_dir/rpm/$file\"";
}
@@ -982,8 +987,7 @@
substr($re, length($2), length($3)) = $val;
}
- $re =~ s/\bexists\(([^),]+),\s*([^)]*)\)/rpm_has_file($1, $2) ? 1 : 0/eg;
- $re =~ s/\bexists\(([^)]*)\)/rpm_has_file($1) ? 1 : 0/eg;
+ $re =~
s/\bexists\(([^),]+)(?:,\s*([^),]*))?(?:,\s*([^),]*))?\)/rpm_has_file($1, $2,
$3) ? 1 : 0/eg;
return $re;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.72/obs/installation-images.spec
new/installation-images-17.0/obs/installation-images.spec
--- old/installation-images-16.72/obs/installation-images.spec 2021-04-23
13:38:05.000000000 +0200
+++ new/installation-images-17.0/obs/installation-images.spec 2021-04-27
13:02:18.000000000 +0200
@@ -650,7 +650,6 @@
BuildRequires: grub2-riscv64-efi
%endif
# inst-sys module for libstoragemgmt
-BuildRequires: libstoragemgmt-netapp-plugin
BuildRequires: libstoragemgmt-smis-plugin
# our images are not reproducible and it's taking time
#!BuildIgnore: build-compare
