Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2020-02-09 21:01:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Sun Feb 9 21:01:47 2020 rev:88 rq:770569 version:14.456
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2020-01-30 09:33:17.525229739 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new.26092/installation-images.changes
2020-02-09 21:01:50.927334191 +0100
@@ -1,0 +2,17 @@
+Thu Feb 6 12:20:32 UTC 2020 - wfe...@opensuse.org
+
+- merge gh#openSUSE/installation-images#357
+- move gconv files into initrd (bsc#1161701)
+- netcfg has moved files to /usr/etc
+- 14.456
+
+--------------------------------------------------------------------
+Mon Feb 3 10:19:15 UTC 2020 - wfe...@opensuse.org
+
+- 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
+
+--------------------------------------------------------------------
Old:
----
installation-images-14.454.tar.xz
New:
----
installation-images-14.456.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.qocbx8/_old 2020-02-09 21:01:51.595334570 +0100
+++ /var/tmp/diff_new_pack.qocbx8/_new 2020-02-09 21:01:51.599334572 +0100
@@ -607,7 +607,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.454
+Version: 14.456
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.454.tar.xz -> installation-images-14.456.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.454/VERSION
new/installation-images-14.456/VERSION
--- old/installation-images-14.454/VERSION 2020-01-24 17:01:12.000000000
+0100
+++ new/installation-images-14.456/VERSION 2020-02-06 13:20:32.000000000
+0100
@@ -1 +1 @@
-14.454
+14.456
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.454/changelog
new/installation-images-14.456/changelog
--- old/installation-images-14.454/changelog 2020-01-24 17:01:12.000000000
+0100
+++ new/installation-images-14.456/changelog 2020-02-06 13:20:32.000000000
+0100
@@ -1,3 +1,14 @@
+2020-02-06: 14.456
+ - merge gh#openSUSE/installation-images#357
+ - move gconv files into initrd (bsc#1161701)
+ - netcfg has moved files to /usr/etc
+
+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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.454/data/base/base.file_list
new/installation-images-14.456/data/base/base.file_list
--- old/installation-images-14.454/data/base/base.file_list 2020-01-24
17:01:12.000000000 +0100
+++ new/installation-images-14.456/data/base/base.file_list 2020-02-06
13:20:32.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.454/data/initrd/initrd.file_list
new/installation-images-14.456/data/initrd/initrd.file_list
--- old/installation-images-14.454/data/initrd/initrd.file_list 2020-01-24
17:01:12.000000000 +0100
+++ new/installation-images-14.456/data/initrd/initrd.file_list 2020-02-06
13:20:32.000000000 +0100
@@ -46,7 +46,6 @@
libcrack*: ignore
libmagic*: ignore
logrotate: ignore
-openssl: ignore
permissions: ignore
pinentry: ignore
suspend: ignore
@@ -74,6 +73,7 @@
krb5:
lsscsi:
mdadm:
+netcfg:
nvme-cli:
sed:
?wicked:
@@ -132,12 +132,6 @@
terminfo:
/usr/share/terminfo/i/ibm3151
-netcfg:
- /etc/hosts
- /etc/netgroup
- /etc/protocols
- /etc/services
-
?xf86-input-vmmouse:
/usr/bin/vmmouse_detect
@@ -404,6 +398,22 @@
lvm2: nodeps
/etc
+# note: locale files are added in root image
+if exists(glibc-locale-base)
+ glibc-locale: ignore
+ glibc-locale-base:
+else
+ glibc-locale:
+endif
+ # charset encodings we might possibly need
+ /usr/lib*/gconv/IBM1047.so
+ /usr/lib*/gconv/ISO8859-1.so
+ /usr/lib*/gconv/UNICODE.so
+ /usr/lib*/gconv/UTF-16.so
+ /usr/lib*/gconv/UTF-32.so
+ /usr/lib*/gconv/gconv-modules*
+
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
# packages with scripts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.454/data/rescue/rescue.file_list
new/installation-images-14.456/data/rescue/rescue.file_list
--- old/installation-images-14.454/data/rescue/rescue.file_list 2020-01-24
17:01:12.000000000 +0100
+++ new/installation-images-14.456/data/rescue/rescue.file_list 2020-02-06
13:20:32.000000000 +0100
@@ -127,6 +127,7 @@
mingetty:
ncurses-utils:
netcat-openbsd:
+netcfg:
nscd:
ntfsprogs:
nvme-cli:
@@ -189,11 +190,13 @@
else
glibc-locale:
endif
- /usr/lib*/gconv/ISO8859*
- /usr/lib*/gconv/KOI*
- /usr/lib*/gconv/UNICODE*
- /usr/lib*/gconv/gconv-modules*
+ # charset encodings we might possibly need
/usr/lib*/gconv/IBM1047.so
+ /usr/lib*/gconv/ISO8859-1.so
+ /usr/lib*/gconv/UNICODE.so
+ /usr/lib*/gconv/UTF-16.so
+ /usr/lib*/gconv/UTF-32.so
+ /usr/lib*/gconv/gconv-modules*
# built in base system
d usr/lib
@@ -211,10 +214,6 @@
t /usr/bin/lessclose.sh
c 0755 0 0 /usr/bin/lessclose.sh
-netcfg:
- /etc
- r /etc/{diphosts,ftpusers,hosts.*}
-
ntfs-3g:
/
s mount.ntfs-3g /sbin/mount.ntfs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.454/data/root/root.file_list
new/installation-images-14.456/data/root/root.file_list
--- old/installation-images-14.454/data/root/root.file_list 2020-01-24
17:01:12.000000000 +0100
+++ new/installation-images-14.456/data/root/root.file_list 2020-02-06
13:20:32.000000000 +0100
@@ -361,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
@@ -408,20 +398,13 @@
# needed for one time ntp sync
chrony:
+# note: gconv files are in initrd
if exists(glibc-locale-base)
glibc-locale: ignore
glibc-locale-base:
else
glibc-locale:
endif
- /usr/lib*/gconv/ISO8859*
- /usr/lib*/gconv/KOI*
- /usr/lib*/gconv/UNICODE*
- /usr/lib*/gconv/UTF-16.so
- /usr/lib*/gconv/UTF-32.so
- /usr/lib*/gconv/gconv-modules*
- /usr/lib*/gconv/IBM1047.so
-
# built in base system
d usr/lib
e cp -a /tmp/locale usr/lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.454/data/root/zenroot.file_list
new/installation-images-14.456/data/root/zenroot.file_list
--- old/installation-images-14.454/data/root/zenroot.file_list 2020-01-24
17:01:12.000000000 +0100
+++ new/installation-images-14.456/data/root/zenroot.file_list 2020-02-06
13:20:32.000000000 +0100
@@ -66,6 +66,7 @@
joe:
klogd:
lvm2:
+netcfg:
ntfsprogs:
open-iscsi:
parted:
@@ -142,9 +143,6 @@
# remove these:
r root mnt tmp usr/libexec
-netcfg:
- /etc/{services,protocols}
-
:
r /lib*/security/pam_userdb.so
@@ -155,13 +153,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.454/lib/AddFiles.pm
new/installation-images-14.456/lib/AddFiles.pm
--- old/installation-images-14.454/lib/AddFiles.pm 2020-01-24
17:01:12.000000000 +0100
+++ new/installation-images-14.456/lib/AddFiles.pm 2020-02-06
13:20:32.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.454/lib/ReadConfig.pm
new/installation-images-14.456/lib/ReadConfig.pm
--- old/installation-images-14.454/lib/ReadConfig.pm 2020-01-24
17:01:12.000000000 +0100
+++ new/installation-images-14.456/lib/ReadConfig.pm 2020-02-06
13:20:32.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
