Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2020-06-10 00:40:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Wed Jun 10 00:40:07 2020 rev:99 rq:813006 version:15.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2020-05-15 23:51:07.225405836 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new.3606/installation-images.changes
2020-06-10 00:40:29.741727053 +0200
@@ -1,0 +2,21 @@
+Tue Jun 9 17:02:40 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#382
+- follow xorg font file shuffle (xorg-x11-legacy, bsc#1169444)
+- 15.4
+
+--------------------------------------------------------------------
+Tue May 19 14:46:03 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#378
+- ensure there's a writable /var/lib/rpm directory (bsc#1171733)
+- 15.3
+
+--------------------------------------------------------------------
+Mon May 18 11:11:20 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#377
+- support Leap-based MicroOS (bsc#1171585)
+- 15.2
+
+--------------------------------------------------------------------
Old:
----
installation-images-15.1.tar.xz
New:
----
installation-images-15.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.c8nevj/_old 2020-06-10 00:40:36.405744528 +0200
+++ /var/tmp/diff_new_pack.c8nevj/_new 2020-06-10 00:40:36.405744528 +0200
@@ -637,7 +637,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 15.1
+Version: 15.4
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-15.1.tar.xz -> installation-images-15.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-15.1/VERSION
new/installation-images-15.4/VERSION
--- old/installation-images-15.1/VERSION 2020-05-12 11:43:26.000000000
+0200
+++ new/installation-images-15.4/VERSION 2020-06-09 19:02:40.000000000
+0200
@@ -1 +1 @@
-15.1
+15.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-15.1/changelog
new/installation-images-15.4/changelog
--- old/installation-images-15.1/changelog 2020-05-12 11:43:26.000000000
+0200
+++ new/installation-images-15.4/changelog 2020-06-09 19:02:40.000000000
+0200
@@ -1,3 +1,15 @@
+2020-06-09: 15.4
+ - merge gh#openSUSE/installation-images#382
+ - follow xorg font file shuffle (xorg-x11-legacy, bsc#1169444)
+
+2020-05-19: 15.3
+ - merge gh#openSUSE/installation-images#378
+ - ensure there's a writable /var/lib/rpm directory (bsc#1171733)
+
+2020-05-18: 15.2
+ - merge gh#openSUSE/installation-images#377
+ - support Leap-based MicroOS (bsc#1171585)
+
2020-05-12: 15.1
- merge gh#openSUSE/installation-images#376
- added microosng to the list of supported products
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-15.1/data/initrd/initrd.file_list
new/installation-images-15.4/data/initrd/initrd.file_list
--- old/installation-images-15.1/data/initrd/initrd.file_list 2020-05-12
11:43:26.000000000 +0200
+++ new/installation-images-15.4/data/initrd/initrd.file_list 2020-06-09
19:02:40.000000000 +0200
@@ -295,6 +295,8 @@
/usr/bin/rpmkeys
/usr/lib*/librpm{,io}.so.*
/usr/lib/rpm/rpmrc
+ # the package contains a symlink to /usr, but we need it writable
(bsc#1171733)
+ d var/lib/rpm
squashfs:
/usr/bin/mksquashfs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-15.1/data/root/root.file_list
new/installation-images-15.4/data/root/root.file_list
--- old/installation-images-15.1/data/root/root.file_list 2020-05-12
11:43:26.000000000 +0200
+++ new/installation-images-15.4/data/root/root.file_list 2020-06-09
19:02:40.000000000 +0200
@@ -489,16 +489,29 @@
rgb:
/usr/share/X11/rgb.txt
-xorg-x11-fonts-core:
- # 'fixed' font
- /usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz
- /usr/share/fonts/misc/fonts.alias
- /usr/share/fonts/misc/cursor.pcf.gz
- /usr/share/fonts/misc/6x13.pcf.gz
- /usr/share/fonts/misc/olcursor.pcf.gz
+if exists(xorg-x11-fonts-legacy)
+ xorg-x11-fonts-core:
+ # 'fixed' font
+ /usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz
+ /usr/share/fonts/misc/fonts.alias
+ /usr/share/fonts/misc/cursor.pcf.gz
+ /usr/share/fonts/misc/6x13.pcf.gz
-xorg-x11-fonts:
- m /usr/share/fonts/75dpi/helvB14-ISO8859-1.pcf.gz /usr/share/fonts/misc
+ xorg-x11-fonts-legacy:
+ /usr/share/fonts/misc/olcursor.pcf.gz
+ m /usr/share/fonts/75dpi/helvB14-ISO8859-1.pcf.gz /usr/share/fonts/misc
+else
+ xorg-x11-fonts-core:
+ # 'fixed' font
+ /usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz
+ /usr/share/fonts/misc/fonts.alias
+ /usr/share/fonts/misc/cursor.pcf.gz
+ /usr/share/fonts/misc/6x13.pcf.gz
+ /usr/share/fonts/misc/olcursor.pcf.gz
+
+ xorg-x11-fonts:
+ m /usr/share/fonts/75dpi/helvB14-ISO8859-1.pcf.gz /usr/share/fonts/misc
+endif
d /etc/X11
x /etc/xorg.conf.template /etc/X11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-15.1/etc/os_sample.txt
new/installation-images-15.4/etc/os_sample.txt
--- old/installation-images-15.1/etc/os_sample.txt 2020-05-12
11:43:26.000000000 +0200
+++ new/installation-images-15.4/etc/os_sample.txt 2020-06-09
19:02:40.000000000 +0200
@@ -37,7 +37,7 @@
BUG_REPORT_URL="https://bugs.opensuse.org";
HOME_URL="https://www.opensuse.org/";
-== leap ==
+== leap (old) ==
NAME="openSUSE Leap"
VERSION="42.1"
@@ -50,6 +50,19 @@
HOME_URL="https://opensuse.org/";
ID_LIKE="suse"
+== leap ==
+
+NAME="openSUSE Leap"
+VERSION="15.0"
+ID="opensuse-leap"
+ID_LIKE="suse opensuse"
+VERSION_ID="15.0"
+PRETTY_NAME="openSUSE Leap 15.0"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:leap:15.0"
+BUG_REPORT_URL="https://bugs.opensuse.org";
+HOME_URL="https://www.opensuse.org/";
+
== openSUSE Kubic [obsolete] ==
NAME="openSUSE-Kubic"
@@ -83,7 +96,7 @@
BUG_REPORT_URL="https://bugs.opensuse.org";
HOME_URL="https://www.opensuse.org/";
-== openSUSE MicroOS ==
+== openSUSE Tumbleweed MicroOS ==
NAME="openSUSE MicroOS"
# VERSION="20190301"
@@ -96,6 +109,18 @@
BUG_REPORT_URL="https://bugs.opensuse.org";
HOME_URL="https://www.opensuse.org/";
+== openSUSE Leap MicroOS ==
+
+NAME="openSUSE MicroOS"
+VERSION="15.2 Alpha"
+ID="opensuse-microos"
+ID_LIKE="suse opensuse opensuse-leap"
+VERSION_ID="15.2"
+PRETTY_NAME="openSUSE MicroOS 15.2 Alpha"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:MicroOS:15.2"
+BUG_REPORT_URL="https://bugs.opensuse.org";
+HOME_URL="https://www.opensuse.org/";
== sles12 ==
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-15.1/lib/ReadConfig.pm
new/installation-images-15.4/lib/ReadConfig.pm
--- old/installation-images-15.1/lib/ReadConfig.pm 2020-05-12
11:43:26.000000000 +0200
+++ new/installation-images-15.4/lib/ReadConfig.pm 2020-06-09
19:02:40.000000000 +0200
@@ -916,9 +916,20 @@
die "*** unsupported product: $dist ***" if $dist !~
/^(casp|caasp|kubic|microos|microosng|leap|sles|sled|tumbleweed( kubic)?)$/;
- my $is_tw = $dist =~ /^(microos|tumbleweed( kubic)?)$/;
+ # Kubic is based on TW
+ # MicroOS can be based on TW or Leap
+
+ my $is_tw = $dist =~ /^tumbleweed( kubic)?$/;
+
+ if($dist eq "microos") {
+ if($config{ID_LIKE} =~ /tumbleweed/) {
+ $is_tw = 1;
+ }
+ elsif($config{ID_LIKE} =~ /leap/) {
+ $dist = "leap";
+ }
+ }
- # kubic uses 'tw' as dist tag
$dist = $is_tw ? 'tw' : "$dist$config{VERSION_ID}";
# there's no separate dist tag for service packs
