Hello community,
here is the log from the commit of package installation-images for
openSUSE:Leap:15.2 checked in at 2020-02-04 17:54:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/installation-images (Old)
and /work/SRC/openSUSE:Leap:15.2/.installation-images.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Tue Feb 4 17:54:50 2020 rev:162 rq:769911 version:14.455
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/installation-images/installation-images.changes
2020-01-17 11:58:55.488437601 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.installation-images.new.26092/installation-images.changes
2020-02-04 17:55:08.952775704 +0100
@@ -1,0 +2,30 @@
+Mon Feb 3 10:19:15 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#356
+- remove explicit dependency on openssl package
+- mount /proc in chroot environment during image build (bsc#1160594)
+- fix package version comparing
+- 14.455
+
+--------------------------------------------------------------------
+Fri Jan 24 16:01:12 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#355
+- don't bind-mount / in rescue system (bsc#1160449)
+- 14.454
+
+--------------------------------------------------------------------
+Fri Jan 24 16:00:45 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#353
+- remove net-tools and net-tools-deprecated
+- remove obsolete net-tools package
+
+--------------------------------------------------------------------
+Tue Jan 21 10:00:04 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#352
+- s390x: I/O device pre-configuration (jsc#SLE-7396)
+- 14.453
+
+--------------------------------------------------------------------
Old:
----
installation-images-14.452.tar.xz
New:
----
installation-images-14.455.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.pOP5kC/_old 2020-02-04 17:55:09.708776160 +0100
+++ /var/tmp/diff_new_pack.pOP5kC/_new 2020-02-04 17:55:09.712776163 +0100
@@ -327,6 +327,7 @@
BuildRequires: hdparm
BuildRequires: hex
BuildRequires: hfsutils
+BuildRequires: hostname
BuildRequires: icewm-lite
BuildRequires: icmpinfo
BuildRequires: indic-fonts
@@ -606,7 +607,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.452
+Version: 14.455
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.452.tar.xz -> installation-images-14.455.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.452/VERSION
new/installation-images-14.455/VERSION
--- old/installation-images-14.452/VERSION 2020-01-13 12:52:50.000000000
+0100
+++ new/installation-images-14.455/VERSION 2020-02-03 11:19:15.000000000
+0100
@@ -1 +1 @@
-14.452
+14.455
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.452/changelog
new/installation-images-14.455/changelog
--- old/installation-images-14.452/changelog 2020-01-13 12:52:50.000000000
+0100
+++ new/installation-images-14.455/changelog 2020-02-03 11:19:15.000000000
+0100
@@ -1,3 +1,20 @@
+2020-02-03: 14.455
+ - merge gh#openSUSE/installation-images#356
+ - remove explicit dependency on openssl package
+ - mount /proc in chroot environment during image build (bsc#1160594)
+ - fix package version comparing
+
+2020-01-24: 14.454
+ - merge gh#openSUSE/installation-images#353
+ - remove net-tools and net-tools-deprecated
+ - remove obsolete net-tools package
+ - merge gh#openSUSE/installation-images#355
+ - don't bind-mount / in rescue system (bsc#1160449)
+
+2020-01-21: 14.453
+ - merge gh#openSUSE/installation-images#352
+ - s390x: I/O device pre-configuration (jsc#SLE-7396)
+
2020-01-13: 14.452
- merge gh#openSUSE/installation-images#350
- udevd compat symlink has been removed from udev package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.452/data/base/base.file_list
new/installation-images-14.455/data/base/base.file_list
--- old/installation-images-14.452/data/base/base.file_list 2020-01-13
12:52:50.000000000 +0100
+++ new/installation-images-14.455/data/base/base.file_list 2020-02-03
11:19:15.000000000 +0100
@@ -83,7 +83,6 @@
mkfontscale:
kmod-compat:
openslp:
-openssl:
p11-kit-tools:
p11-kit:
pam:
@@ -111,12 +110,7 @@
<release_theme>-release: nodeps
ca-certificates:
- /usr/sbin/update-ca-certificates
- /usr/lib/ca-certificates/update.d/*openssl.run
- /usr/lib/ca-certificates/update.d/*etc_ssl.run
- /var/lib/ca-certificates/openssl
- /etc/ssl/certs
- /var/lib/ca-certificates/pem
+ /
aaa_base:
E prein
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.452/data/initrd/initrd.file_list
new/installation-images-14.455/data/initrd/initrd.file_list
--- old/installation-images-14.452/data/initrd/initrd.file_list 2020-01-13
12:52:50.000000000 +0100
+++ new/installation-images-14.455/data/initrd/initrd.file_list 2020-02-03
11:19:15.000000000 +0100
@@ -46,7 +46,6 @@
libcrack*: ignore
libmagic*: ignore
logrotate: ignore
-openssl: ignore
permissions: ignore
pinentry: ignore
suspend: ignore
@@ -65,6 +64,7 @@
ethtool:
glibc:
haveged:
+hostname:
hwinfo:
iputils:
iscsiuio:
@@ -73,8 +73,6 @@
krb5:
lsscsi:
mdadm:
-net-tools:
-?net-tools-deprecated:
nvme-cli:
sed:
?wicked:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.452/data/initrd/scripts/early_setup
new/installation-images-14.455/data/initrd/scripts/early_setup
--- old/installation-images-14.452/data/initrd/scripts/early_setup
2020-01-13 12:52:50.000000000 +0100
+++ new/installation-images-14.455/data/initrd/scripts/early_setup
2020-02-03 11:19:15.000000000 +0100
@@ -80,3 +80,7 @@
done < <(/etc/wicked/extensions/ibft -l)
echo "ibftdevices: $ibft" >/etc/ibft_devices
+# s390x: I/O device pre-configuration (jsc#SLE-7396)
+if [ -x /sbin/chzdev -a -e /sys/firmware/sclp_sd/config/data ] ; then
+ /sbin/chzdev --import /sys/firmware/sclp_sd/config/data
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.452/data/initrd/scripts/prepare_rescue
new/installation-images-14.455/data/initrd/scripts/prepare_rescue
--- old/installation-images-14.452/data/initrd/scripts/prepare_rescue
2020-01-13 12:52:50.000000000 +0100
+++ new/installation-images-14.455/data/initrd/scripts/prepare_rescue
2020-02-03 11:19:15.000000000 +0100
@@ -74,10 +74,6 @@
done
fi
-# ensure there's a mountpoint for /, else udevd will have problems
-# cf. bsc #937237, comment 51
-mount --bind / /
-
if [ "$startshell" = 1 ] ; then
echo "exit shell to continue startup process..."
bash >/dev/console 2>&1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.452/data/rescue/rescue.file_list
new/installation-images-14.455/data/rescue/rescue.file_list
--- old/installation-images-14.452/data/rescue/rescue.file_list 2020-01-13
12:52:50.000000000 +0100
+++ new/installation-images-14.455/data/rescue/rescue.file_list 2020-02-03
11:19:15.000000000 +0100
@@ -37,12 +37,10 @@
# install filesystem first and *REMOVE* /var/run link
filesystem:
- /etc/{ppp,rc.d,uucp}
/etc/sysconfig
/root
/run
/etc/init.d
- /usr/tmp
/var
# remove temporarily so that 'mount /sys' doesn't work
r /sys
@@ -110,6 +108,7 @@
gzip:
hdparm:
hex:
+hostname:
hwinfo:
icmpinfo:
initviocons:
@@ -127,8 +126,6 @@
lsscsi:
mingetty:
ncurses-utils:
-net-tools:
-?net-tools-deprecated:
netcat-openbsd:
nscd:
ntfsprogs:
@@ -182,14 +179,6 @@
/usr/lib*/samba/lib{replace,winbind-client,genrand,samba-debug,socket-blocking,sys-rw,time-basic,iov-buf}-samba4.so
endif
-rpm:
- /bin
- /usr/bin
- /{usr,var}/lib/rpm
- /usr/lib*/librpm*.so.*
-r /usr/lib/rpm/rpm{get,put}text
-r /usr/bin/rpmqpack
-
gawk:
/usr/bin/gawk
s gawk usr/bin/awk
@@ -211,8 +200,7 @@
e cp -a /tmp/locale usr/lib
less:
- /etc
- /usr/bin
+ /
r /usr/bin/lesspipe.sh
t /usr/bin/lesspipe.sh
c 0755 0 0 /usr/bin/lesspipe.sh
@@ -282,6 +270,10 @@
#
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+rpm:
+ /
+ E postin
+
aaa_base:
E prein
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.452/data/root/root.file_list
new/installation-images-14.455/data/root/root.file_list
--- old/installation-images-14.452/data/root/root.file_list 2020-01-13
12:52:50.000000000 +0100
+++ new/installation-images-14.455/data/root/root.file_list 2020-02-03
11:19:15.000000000 +0100
@@ -152,8 +152,6 @@
?ltrace:
lvm2:
multipath-tools:
-net-tools:
-?net-tools-deprecated:
ntfsprogs:
open-iscsi:
openslp:
@@ -255,6 +253,7 @@
less:
/etc/lesskey
+ /usr/etc/lesskey
/usr/bin/less
strace:
@@ -362,16 +361,6 @@
x etc/ssh /lib
x ../rescue/mount-rootfs-and-do-chroot.sh /bin
-if exists(openssl, /usr/share/ssl)
- openssl:
-else
- # FIXME: for now, ignore old version, else the solver will have multiple
- # choices and things go down...
- openssl-1_0_0: ignore
- openssl-*:
-endif
- /usr/share/ssl
-
nscd:
/etc
/usr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.452/data/root/zenroot.file_list
new/installation-images-14.455/data/root/zenroot.file_list
--- old/installation-images-14.452/data/root/zenroot.file_list 2020-01-13
12:52:50.000000000 +0100
+++ new/installation-images-14.455/data/root/zenroot.file_list 2020-02-03
11:19:15.000000000 +0100
@@ -29,12 +29,10 @@
# install filesystem first and *REMOVE* /var/run link
filesystem:
- /etc/{ppp,rc.d,uucp}
/etc/sysconfig
/root
/run
/etc/init.d
- /usr/tmp
/var
# remove temporarily so that 'mount /sys' doesn't work
r /sys
@@ -59,6 +57,7 @@
gzip:
hdparm:
hex:
+hostname:
hwinfo:
initviocons:
insserv-compat:
@@ -67,8 +66,6 @@
joe:
klogd:
lvm2:
-net-tools:
-?net-tools-deprecated:
ntfsprogs:
open-iscsi:
parted:
@@ -129,6 +126,7 @@
less:
/etc/lesskey
+ /usr/etc/lesskey
/usr/bin/less
psmisc:
@@ -157,13 +155,6 @@
x etc/ssh /lib
x ../rescue/mount-rootfs-and-do-chroot.sh /bin
-if exists(openssl, /usr/share/ssl)
- openssl:
-else
- openssl-*:
-endif
- /usr/share/ssl
-
dmidecode:
/usr/sbin/dmidecode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.452/lib/AddFiles.pm
new/installation-images-14.455/lib/AddFiles.pm
--- old/installation-images-14.452/lib/AddFiles.pm 2020-01-13
12:52:50.000000000 +0100
+++ new/installation-images-14.455/lib/AddFiles.pm 2020-02-03
11:19:15.000000000 +0100
@@ -769,12 +769,29 @@
SUSystem "mv $basedir/base/xxxx $dir" and die "oops";
}
else {
+ # Set up /proc and /dev/fd if they are missing as a number of tools
+ # rely on these (bsc#1160594).
+
+ my $has_proc = -d "$dir/proc";
+ my $has_dev = -d "$dir/dev";
+ my $has_dev_fd = -e "$dir/dev/fd";
+
+ SUSystem("mkdir $dir/dev") if !$has_dev;
+ SUSystem("ln -s /proc/self/fd $dir/dev/fd") if !$has_dev_fd;
+ SUSystem("mkdir $dir/proc") if !$has_proc;
+ SUSystem("mount -oro -t proc proc $dir/proc");
+
if($is_script) {
$r = SUSystem "chroot $dir /bin/sh -c 'sh install/inst.sh 1'";
}
else {
$r = SUSystem "chroot $dir /bin/sh -c '$cmd'";
}
+
+ SUSystem("umount $dir/proc");
+ SUSystem("rmdir $dir/proc") if !$has_proc;
+ SUSystem("rm $dir/dev/fd") if !$has_dev_fd;
+ SUSystem("rmdir $dir/dev") if !$has_dev;
}
warn "$Script: execution of $pm failed" if $r;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.452/lib/ReadConfig.pm
new/installation-images-14.455/lib/ReadConfig.pm
--- old/installation-images-14.452/lib/ReadConfig.pm 2020-01-13
12:52:50.000000000 +0100
+++ new/installation-images-14.455/lib/ReadConfig.pm 2020-02-03
11:19:15.000000000 +0100
@@ -189,6 +189,7 @@
sub resolve_deps_libsolv;
sub show_package_deps;
sub get_version_info;
+sub version_cmp;
my ($arch, $realarch, $susearch);
@@ -284,7 +285,7 @@
return $rpmData->{$rpm_orig} = undef if @f == 0;
- @f = sort @f;
+ @f = sort { &version_cmp } @f;
# for (@f) { print ">$_<\n"; }
$f = pop @f;
$f = pop @f if $back;
@@ -542,20 +543,6 @@
}
-sub version_sort
-{
- my ($i, $j);
-
- $i = $ConfigData{ini}{Version}{$a};
- $j = $ConfigData{ini}{Version}{$b};
-
- $i =~ s/,([^,]+)//;
- $j =~ s/,([^,]+)//;
-
- return $i <=> $j;
-}
-
-
sub get_repo_list
{
local $_;
@@ -947,6 +934,23 @@
}
+# compare version strings
+#
+# Ensuring that e.g. 'foo11' comes after 'foo4'.
+#
+sub version_cmp
+{
+ my $x = $a;
+ my $y = $b;
+
+ # assume numbers will have at most 10 digits...
+ $x =~ s/(\d+)/sprintf "%010s", $1/eg;
+ $y =~ s/(\d+)/sprintf "%010s", $1/eg;
+
+ return $x cmp $y;
+}
+
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
# initialization part
