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-11-20 22:47:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Sat Nov 20 22:47:57 2021 rev:147 rq:932551 version:17.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2021-11-18 10:33:24.299883472 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new.1895/installation-images.changes
2021-11-20 22:48:19.395803969 +0100
@@ -1,0 +2,21 @@
+Fri Nov 19 14:24:14 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/installation-images#543
+- clean up Xorg config (bsc#1192678)
+- 17.22
+
+--------------------------------------------------------------------
+Thu Nov 18 15:03:26 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/installation-images#542
+- fix spec file
+- 17.21
+
+--------------------------------------------------------------------
+Thu Nov 18 13:09:50 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/installation-images#541
+- Leap Micro support
+- 17.20
+
+--------------------------------------------------------------------
Old:
----
installation-images-17.19.tar.xz
New:
----
installation-images-17.22.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.V8wMzu/_old 2021-11-20 22:48:19.951802127 +0100
+++ /var/tmp/diff_new_pack.V8wMzu/_new 2021-11-20 22:48:19.955802113 +0100
@@ -103,6 +103,10 @@
%endif
%endif
+%if "%flavor" == "LeapMicro"
+%define theme LeapMicro
+%endif
+
%if "%flavor" == "MicroOS"
# don't build on Leap for now
%if 0%{?is_opensuse} && !0%{?sle_version}
@@ -187,16 +191,23 @@
%global product_name openSUSE-Kubic
%endif
-%if "%theme" == "SMO"
+%if "%theme" == "SMO" || "%theme" == "LeapMicro"
%define with_storage_ng 1
%define with_ssl_hmac 0
%define branding_skelcd SMO
%define branding_systemd SMO
+%if "%theme" == "LeapMicro"
+BuildRequires: Leap-Micro-release Leap-Micro-release-dvd
+%define branding_plymouth openSUSE
+%define branding_grub2 openSUSE
+%define branding_gfxboot openSUSE
+%else
+BuildRequires: SUSE-MicroOS-release
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
+%endif
%define config_bootmenu_no_upgrade 1
-BuildRequires: SUSE-MicroOS-release
# system-group-kvm needed for 15-SP2 based MicroOS
BuildRequires: system-group-kvm
%endif
@@ -674,7 +685,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
-Version: 17.19
+Version: 17.22
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-17.19.tar.xz -> installation-images-17.22.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.19/VERSION
new/installation-images-17.22/VERSION
--- old/installation-images-17.19/VERSION 2021-11-10 17:58:24.000000000
+0100
+++ new/installation-images-17.22/VERSION 2021-11-19 15:24:14.000000000
+0100
@@ -1 +1 @@
-17.19
+17.22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.19/changelog
new/installation-images-17.22/changelog
--- old/installation-images-17.19/changelog 2021-11-10 17:58:24.000000000
+0100
+++ new/installation-images-17.22/changelog 2021-11-19 15:24:14.000000000
+0100
@@ -1,3 +1,15 @@
+2021-11-19: 17.22
+ - merge gh#openSUSE/installation-images#543
+ - clean up Xorg config (bsc#1192678)
+
+2021-11-18: 17.21
+ - merge gh#openSUSE/installation-images#542
+ - fix spec file
+
+2021-11-18: 17.20
+ - merge gh#openSUSE/installation-images#541
+ - Leap Micro support
+
2021-11-10: 17.19
- merge gh#openSUSE/installation-images#535
- follow python packages rename: python3-* to python38-*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-17.19/data/root/etc/xorg.conf.template
new/installation-images-17.22/data/root/etc/xorg.conf.template
--- old/installation-images-17.19/data/root/etc/xorg.conf.template
2021-11-10 17:58:24.000000000 +0100
+++ new/installation-images-17.22/data/root/etc/xorg.conf.template
2021-11-19 15:24:14.000000000 +0100
@@ -1,47 +1,25 @@
Section "Device"
- Identifier "vboxvideo"
- Driver "vboxvideo"
-EndSection
-
-Section "Screen"
- Identifier "vboxvideo"
- Device "vboxvideo"
-EndSection
-
-
-Section "Device"
- Identifier "vmware"
- Driver "vmware"
-EndSection
-
-Section "Screen"
- Identifier "vmware"
- Device "vmware"
-EndSection
-
-
-Section "Device"
Identifier "modesetting"
Driver "modesetting"
Option "PreferCloneMode" "true"
Option "AccelMethod" "none"
EndSection
+
Section "Screen"
Identifier "modesetting"
Device "modesetting"
EndSection
-
Section "Device"
Identifier "fbdev"
Driver "fbdev"
EndSection
+
Section "Screen"
Identifier "fbdev"
Device "fbdev"
EndSection
-
Section "Device"
Identifier "vesa"
Driver "vesa"
@@ -52,11 +30,8 @@
Device "vesa"
EndSection
-
Section "ServerLayout"
Identifier "Layout"
- Screen "vboxvideo"
- Screen "vmware"
Screen "modesetting"
Screen "fbdev"
Screen "vesa"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.19/data/root/root.file_list
new/installation-images-17.22/data/root/root.file_list
--- old/installation-images-17.19/data/root/root.file_list 2021-11-10
17:58:24.000000000 +0100
+++ new/installation-images-17.22/data/root/root.file_list 2021-11-19
15:24:14.000000000 +0100
@@ -435,34 +435,27 @@
r /usr/share/zoneinfo/posix*
r /usr/share/zoneinfo/right
-if !(arch eq 's390' || arch eq 's390x')
- kbd:
- /
- m /usr/share/fillup-templates/sysconfig.keyboard /etc/sysconfig/keyboard
-endif
+kbd:
+ /
+ m /usr/share/fillup-templates/sysconfig.keyboard /etc/sysconfig/keyboard
if roottrans
include ../../tmp/base/yast2-trans.inc
endif
-if arch ne 's390' && arch ne 's390x'
+# a 'real' X server might not always exist (on s390x, for example)
+if exists(xorg-x11-server,/usr/bin/Xorg)
xorg-x11-server:
xrandr:
?xf86-input-evdev:
?xf86-input-libinput:
- xf86-input-wacom:
- xf86-video-fbdev:
+ ?xf86-input-wacom:
+ ?xf86-video-fbdev:
?xf86-video-vesa:
- ?xf86-video-qxl:
- ?xf86-video-amdgpu:
-
- ?xf86-video-intel: nodeps
- /usr/<lib>/xorg
?virtualbox-guest-x11: nodeps
/etc
/usr/<lib>/xorg/modules
-
endif
iptables:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.19/etc/config
new/installation-images-17.22/etc/config
--- old/installation-images-17.19/etc/config 2021-11-10 17:58:24.000000000
+0100
+++ new/installation-images-17.22/etc/config 2021-11-19 15:24:14.000000000
+0100
@@ -170,6 +170,17 @@
plymouth = openSUSE
systemd = MicroOS
+[Theme LeapMicro]
+image = 350
+patch_zypp_config = 1
+release = Leap-Micro
+skelcd = SMO
+skelcd_ctrl = SMO
+gfxboot = openSUSE
+grub2 = openSUSE
+plymouth = openSUSE
+systemd = SMO
+
[Theme Zen]
image = 600
patch_zypp_config = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.19/lib/ReadConfig.pm
new/installation-images-17.22/lib/ReadConfig.pm
--- old/installation-images-17.19/lib/ReadConfig.pm 2021-11-10
17:58:24.000000000 +0100
+++ new/installation-images-17.22/lib/ReadConfig.pm 2021-11-19
15:24:14.000000000 +0100
@@ -844,6 +844,7 @@
# SUSE MicroOS is kept called MicroOS insternally, but the product NAME
# is now SLE Micro
$dist = "suse-microos" if $dist eq "sle micro";
+ $dist = "suse-microos" if $dist eq "leap micro";
# don't accept other names than these
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-17.19/obs/installation-images.spec
new/installation-images-17.22/obs/installation-images.spec
--- old/installation-images-17.19/obs/installation-images.spec 2021-11-10
17:58:24.000000000 +0100
+++ new/installation-images-17.22/obs/installation-images.spec 2021-11-19
15:24:14.000000000 +0100
@@ -103,6 +103,10 @@
%endif
%endif
+%if "%flavor" == "LeapMicro"
+%define theme LeapMicro
+%endif
+
%if "%flavor" == "MicroOS"
# don't build on Leap for now
%if 0%{?is_opensuse} && !0%{?sle_version}
@@ -187,16 +191,23 @@
%global product_name openSUSE-Kubic
%endif
-%if "%theme" == "SMO"
+%if "%theme" == "SMO" || "%theme" == "LeapMicro"
%define with_storage_ng 1
%define with_ssl_hmac 0
%define branding_skelcd SMO
%define branding_systemd SMO
+%if "%theme" == "LeapMicro"
+BuildRequires: Leap-Micro-release Leap-Micro-release-dvd
+%define branding_plymouth openSUSE
+%define branding_grub2 openSUSE
+%define branding_gfxboot openSUSE
+%else
+BuildRequires: SUSE-MicroOS-release
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
+%endif
%define config_bootmenu_no_upgrade 1
-BuildRequires: SUSE-MicroOS-release
# system-group-kvm needed for 15-SP2 based MicroOS
BuildRequires: system-group-kvm
%endif
