Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2017-09-13 22:18:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Wed Sep 13 22:18:03 2017 rev:20 rq:525891 version:14.330
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2017-08-10 13:44:46.919235247 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2017-09-13 22:18:05.706998082 +0200
@@ -0,0 +1,104 @@
+-------------------------------------------------------------------
+Wed Sep 13 16:29:28 CEST 2017 - [email protected]
+
+- xf86-video-vesa is back (bsc#1058310)
+
+-------------------------------------------------------------------
+Tue Sep 12 13:35:41 CEST 2017 - [email protected]
+
+- use new is_susesap flag to trigger sap builds
+
+--------------------------------------------------------------------
+Mon Sep 11 12:07:30 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#200
+- adjust to work with the graphviz package split
+- enhance documentation of 'exists' function in file lists
+- 14.330
+
+--------------------------------------------------------------------
+Mon Sep 11 08:32:55 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#199
+- tumbleweed kubic: os-release file changed again
+- 14.329
+
+--------------------------------------------------------------------
+Mon Sep 11 08:32:44 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#198
+- Kubic needs to be have the same zypp.conf as CaaSP
+
+--------------------------------------------------------------------
+Fri Sep 8 11:12:11 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#197
+- treat tumbleweed-kubic as tumbleweed for driver updates
+- 14.328
+
+--------------------------------------------------------------------
+Thu Sep 7 14:44:21 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#196
+- fix unsupported product detection logic
+- 14.327
+
+--------------------------------------------------------------------
+Thu Sep 7 14:01:22 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#195
+- adjust to keep it working also on sle12-sp3
+- Kubic is now Tumbleweed-Kubic
+- have build fail if we build for an (yet) unknown distro
+- 14.326
+
+-------------------------------------------------------------------
+Thu Sep 7 12:17:12 CEST 2017 - [email protected]
+
+- it's now openSUSE-Tumbleweed-Kubic-release
+
+-------------------------------------------------------------------
+Thu Sep 7 12:07:04 CEST 2017 - [email protected]
+
+- make building with storage-ng configurable again and turn it off
+ with openSUSE builds
+
+-------------------------------------------------------------------
+Tue Sep 5 13:11:23 CEST 2017 - [email protected]
+
+- always use libinput driver (bsc#1055513)
+
+-------------------------------------------------------------------
+Tue Sep 5 11:07:55 CEST 2017 - [email protected]
+
+- remove unused dmapi from BuildRequires
+
+-------------------------------------------------------------------
+Mon Sep 4 14:32:33 CEST 2017 - [email protected]
+
+- remove unused recode from BuildRequires (bsc#1053648)
+
+-------------------------------------------------------------------
+Fri Aug 18 14:37:49 CEST 2017 - [email protected]
+
+- don't build sles on ix86 (bsc#1054238)
+
+-------------------------------------------------------------------
+Wed Aug 16 16:01:33 CEST 2017 - [email protected]
+
+- switch to storage-ng
+
+--------------------------------------------------------------------
+Wed Aug 16 08:16:28 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#194
+- drop obsolete xorg input drivers (bsc#1053806)
+- 14.325
+
+--------------------------------------------------------------------
+Tue Aug 15 13:13:56 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#193
+- drop obsolete xorg drivers (bsc#1053806)
+- 14.324
+
Old:
----
installation-images-14.323.tar.xz
New:
----
installation-images-14.330.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.4Oma3F/_old 2017-09-13 22:18:06.426896732 +0200
+++ /var/tmp/diff_new_pack.4Oma3F/_new 2017-09-13 22:18:06.426896732 +0200
@@ -27,6 +27,8 @@
%define with_vbox 0
%define with_plymouth 1
%define with_shim 1
+%define with_storage_ng 1
+%define with_libinput 1
%bcond_without sbl
%bcond_without vnc
%bcond_with xen
@@ -56,21 +58,25 @@
%if "%flavor" == "SLES"
%if 0%{?sle_version} && !0%{?is_opensuse}
+%ifnarch %ix86
%define theme SLES
%endif
%endif
+%endif
%if "%flavor" == "SLES_SAP"
-%if 0%{?sle_version} && !0%{?is_opensuse} && !0%{?is_susecaasp} && (
"%{_target_cpu}" == "x86_64" || "%{_target_cpu}" == "ppc64le" )
+%if 0%{?sle_version} && 0%{?is_susesap} && ( "%{_target_cpu}" == "x86_64" ||
"%{_target_cpu}" == "ppc64le" )
%define theme SLES_SAP
%endif
%endif
%if "%flavor" == "CAASP"
%if 0%{?is_susecaasp}
+%ifnarch %ix86
%define theme CAASP
%endif
%endif
+%endif
# === define each theme ===
@@ -79,15 +85,13 @@
%endif
%if "%theme" == "openSUSE"
+%define with_storage_ng 0
%define branding_skelcd openSUSE
%define branding_systemd openSUSE
%define branding_plymouth openSUSE
%define branding_grub2 openSUSE
%define branding_gfxboot openSUSE
BuildRequires: openSUSE-release
-%ifnarch s390x
-BuildRequires: xf86-input-libinput
-%endif
# only for Leap-42.3 on x86_64 (bsc#1043146):
%if "%{?sle_version}" == "120300" && "%{_target_cpu}" == "x86_64"
BuildRequires: drm-kmp-default
@@ -95,15 +99,13 @@
%endif
%if "%theme" == "Kubic"
+%define with_storage_ng 0
%define branding_skelcd CAASP
%define branding_systemd CAASP
%define branding_plymouth openSUSE
%define branding_grub2 openSUSE
%define branding_gfxboot openSUSE
-BuildRequires: openSUSE-Kubic-release
-%ifnarch s390x
-BuildRequires: xf86-input-libinput
-%endif
+BuildRequires: openSUSE-Tumbleweed-Kubic-release
%endif
%if "%theme" == "SLED"
@@ -114,6 +116,8 @@
%define branding_gfxboot SLE
BuildRequires: sled-release
%if 0%{?sle_version} != 0150000
+%define with_storage_ng 0
+%define with_libinput 0
BuildRequires: sled-release-DVD
BuildRequires: sle12-desktop-migration
%endif
@@ -127,6 +131,8 @@
%define branding_gfxboot SLE
BuildRequires: sles-release
%if 0%{?sle_version} != 0150000
+%define with_storage_ng 0
+%define with_libinput 0
BuildRequires: sles-release-DVD
BuildRequires: sle12-desktop-migration
%ifarch x86_64 ppc64le
@@ -143,6 +149,8 @@
%define branding_gfxboot SLE
BuildRequires: SLES_SAP-installation-release
%if 0%{?sle_version} != 0150000
+%define with_storage_ng 0
+%define with_libinput 0
BuildRequires: sles-release-DVD
BuildRequires: sle12-desktop-migration
BuildRequires: sap-installation-wizard
@@ -158,6 +166,8 @@
%define config_bootmenu_no_upgrade 1
BuildRequires: caasp-release
%if 0%{?sle_version} != 0150000
+%define with_storage_ng 0
+%define with_libinput 0
BuildRequires: caasp-release-DVD
%endif
%endif
@@ -187,6 +197,11 @@
ExcludeArch: %ix86
%endif
+%if 0%{?with_libinput}
+%ifnarch s390x
+BuildRequires: xf86-input-libinput
+%endif
+%endif
BuildRequires: google-roboto-fonts
BuildRequires: noto-sans-fonts
%ifarch ia64 %ix86 x86_64
@@ -226,7 +241,6 @@
BuildRequires: dd_rescue
BuildRequires: dejavu-fonts
BuildRequires: dhcp-server
-BuildRequires: dmapi
BuildRequires: dmraid
BuildRequires: dosfstools
BuildRequires: dracut-fips
@@ -350,7 +364,6 @@
BuildRequires: procps
BuildRequires: psmisc
BuildRequires: python
-BuildRequires: recode
BuildRequires: reiserfs
BuildRequires: rgb
BuildRequires: rpcbind
@@ -439,20 +452,13 @@
%endif
BuildRequires: kbd
BuildRequires: xf86-input-evdev
-BuildRequires: xf86-input-synaptics
%ifarch %ix86 x86_64
BuildRequires: xf86-video-intel
+BuildRequires: xf86-video-vesa
BuildRequires: xf86-video-vmware
%endif
-BuildRequires: xf86-input-void
BuildRequires: xf86-input-wacom
-BuildRequires: xf86-video-ati
-BuildRequires: xf86-video-cirrus
BuildRequires: xf86-video-fbdev
-BuildRequires: xf86-video-nv
-BuildRequires: xf86-video-r128
-BuildRequires: xf86-video-sis
-BuildRequires: xf86-video-vesa
%endif
BuildRequires: grub2
%ifarch ppc ppc64 ppc64le
@@ -531,7 +537,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.323
+Version: 14.330
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.323.tar.xz -> installation-images-14.330.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.323/VERSION
new/installation-images-14.330/VERSION
--- old/installation-images-14.323/VERSION 2017-08-04 10:30:49.000000000
+0200
+++ new/installation-images-14.330/VERSION 2017-09-11 14:07:30.000000000
+0200
@@ -1 +1 @@
-14.323
+14.330
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.323/changelog
new/installation-images-14.330/changelog
--- old/installation-images-14.323/changelog 2017-08-04 10:30:49.000000000
+0200
+++ new/installation-images-14.330/changelog 2017-09-11 14:07:30.000000000
+0200
@@ -1,3 +1,28 @@
+2017-09-11: 14.330
+ - enhance documentation of 'exists' function in file lists
+ - adjust to work with the graphviz package split
+
+2017-09-11: 14.329
+ - tumbleweed kubic: os-release file changed again
+ - Kubic needs to be have the same zypp.conf as CaaSP
+
+2017-09-08: 14.328
+ - treat tumbleweed-kubic as tumbleweed for driver updates
+
+2017-09-07: 14.327
+ - fix unsupported product detection logic
+
+2017-09-07: 14.326
+ - have build fail if we build for an (yet) unknown distro
+ - Kubic is now Tumbleweed-Kubic
+ - adjust to keep it working also on sle12-sp3
+
+2017-08-16: 14.325
+ - drop obsolete xorg input drivers (bsc #1053806)
+
+2017-08-15: 14.324
+ - drop obsolete xorg drivers (bsc #1053806)
+
2017-08-04: 14.323
- Fix the default cursor theme (bsc #1051664)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.323/data/initrd/initrd.file_list
new/installation-images-14.330/data/initrd/initrd.file_list
--- old/installation-images-14.323/data/initrd/initrd.file_list 2017-08-04
10:30:49.000000000 +0200
+++ new/installation-images-14.330/data/initrd/initrd.file_list 2017-09-11
14:07:30.000000000 +0200
@@ -116,7 +116,7 @@
# add zypp config to initrd to ensure it's writable
libzypp: nodeps
/etc
- if theme eq 'CAASP'
+ if (theme eq 'CAASP') || (theme eq 'Kubic')
# patch /etc/zypp/zypp.conf (fate #321764); sets
# solver.onlyRequires = true, rpm.install.excludedocs = yes, multiversion =
R s/^[#[:space:]]*(solver.onlyRequires)\s+=.*/# minimal CAASP\n$1 = true/
etc/zypp/zypp.conf
@@ -433,7 +433,7 @@
udev:
/
E prein
- E groupadd -r tape
+ E groupadd -r tape || true
# we just want the user & group entries
polkit: nodeps
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.323/data/root/root.file_list
new/installation-images-14.330/data/root/root.file_list
--- old/installation-images-14.323/data/root/root.file_list 2017-08-04
10:30:49.000000000 +0200
+++ new/installation-images-14.330/data/root/root.file_list 2017-09-11
14:07:30.000000000 +0200
@@ -444,16 +444,9 @@
xrandr:
xf86-input-evdev:
?xf86-input-libinput:
- xf86-input-synaptics:
?xf86-input-vmmouse:
- xf86-input-void:
xf86-input-wacom:
- xf86-video-ati: nodeps
- xf86-video-cirrus:
xf86-video-fbdev:
- xf86-video-nv:
- xf86-video-r128:
- xf86-video-sis:
?xf86-video-vesa:
?xf86-video-intel: nodeps
@@ -562,7 +555,11 @@
/usr/share/fonts/truetype/KacstBook.ttf
dmz-icon-theme-cursors:
- /usr/share/icons/DMZ-White
+ if exists(dmz-icon-theme-cursors, /usr/share/icons/DMZ-White)
+ /usr/share/icons/DMZ-White
+ else
+ /usr/share/icons/DMZ
+ endif
multipath-tools:
/sbin
@@ -615,8 +612,16 @@
E [ -x /usr/bin/pango-querymodules ] && pango-querymodules
>/etc/pango/pango.modules || true
E [ -x /usr/bin/pango-querymodules-64 ] && pango-querymodules-64
>/etc/pango/pango64.modules || true
+# graphviz has been split and the scripts moved to graphviz-plugins-core
+#
graphviz:
/
+ if exists(graphviz, ../postin)
+ E postin
+ endif
+
+?graphviz-plugins-core:
+ /
E postin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.323/doc/files.md
new/installation-images-14.330/doc/files.md
--- old/installation-images-14.323/doc/files.md 2017-08-04 10:30:49.000000000
+0200
+++ new/installation-images-14.330/doc/files.md 2017-09-11 14:07:30.000000000
+0200
@@ -81,7 +81,13 @@
Also, you can use `exists(PACKAGE)` to test for a specific package or
`exists(PACKAGE, FILE)` to test for a file in a package.
-Example:
+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
+tree. This can be used to check for the existence of rpm scripts (they are
+cached one level up). Looking at the cache in `tmp/cache/PRODUCT/RPMNAME`
+might make this clearer.
+
+Examples:
```
if arch eq 'ppc' && theme eq 'SLES'
@@ -91,6 +97,22 @@
else
# ...
endif
+
+# only if package foo exists
+if exists(foo)
+# ...
+endif
+
+# only if package foo has a file /usr/bin/bar
+if exists(foo, usr/bin/bar)
+# ...
+endif
+
+# only if package foo has a postin script
+if exists(foo, ../postin)
+# ...
+endif
+
```
### Environment variables
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.323/etc/config
new/installation-images-14.330/etc/config
--- old/installation-images-14.323/etc/config 2017-08-04 10:30:49.000000000
+0200
+++ new/installation-images-14.330/etc/config 2017-09-11 14:07:30.000000000
+0200
@@ -135,7 +135,7 @@
[Theme Kubic]
image = 350
-release = openSUSE-Kubic
+release = openSUSE-Tumbleweed-Kubic
skelcd = openSUSE
skelcd_ctrl = CAASP
yast = openSUSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.323/etc/os_sample.txt
new/installation-images-14.330/etc/os_sample.txt
--- old/installation-images-14.323/etc/os_sample.txt 2017-08-04
10:30:49.000000000 +0200
+++ new/installation-images-14.330/etc/os_sample.txt 2017-09-11
14:07:30.000000000 +0200
@@ -50,7 +50,7 @@
HOME_URL="https://opensuse.org/";
ID_LIKE="suse"
-== openSUSE Kubic ==
+== openSUSE Kubic [obsolete] ==
NAME="openSUSE-Kubic"
VERSION="1.0"
@@ -60,6 +60,29 @@
ANSI_COLOR="0;32"
CPE_NAME="cpe:/o:opensuse:opensuse-kubic:1.0"
+== openSUSE Tumbleweed Kubic [obsolete] ==
+
+NAME="openSUSE-Tumbleweed-Kubic"
+VERSION="20170905"
+VERSION_ID="20170905"
+PRETTY_NAME="openSUSE Tumbleweed Kubic"
+ID="opensuse-tumbleweed-kubic"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:opensuse-tumbleweed-kubic:20170905"
+
+== openSUSE Tumbleweed Kubic ==
+
+NAME="openSUSE Tumbleweed Kubic"
+# VERSION="20170909"
+ID="opensuse-tumbleweed-kubic"
+ID_LIKE="suse opensuse"
+VERSION_ID="20170909"
+PRETTY_NAME="openSUSE Tumbleweed Kubic"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:tumbleweed-kubic:20170909"
+BUG_REPORT_URL="https://bugs.opensuse.org";
+HOME_URL="https://www.opensuse.org/";
+
== sles12 ==
NAME="SLES"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.323/lib/ReadConfig.pm
new/installation-images-14.330/lib/ReadConfig.pm
--- old/installation-images-14.323/lib/ReadConfig.pm 2017-08-04
10:30:49.000000000 +0200
+++ new/installation-images-14.330/lib/ReadConfig.pm 2017-09-11
14:07:30.000000000 +0200
@@ -894,11 +894,12 @@
# special enterprise products may have extra text beside SLES or SLED
$dist = $1 if $dist =~ /(sles|sled)/;
# don't accept other names than these
- $dist = "" if $dist !~ /^(casp|caasp|kubic|leap|sles|sled)$/;
- my $is_tw = $config{VERSION} eq 'Tumbleweed' || $config{CPE_NAME} =~
/:tumbleweed:/;
+ die "*** unsupported product: $dist ***" if $dist !~
/^(casp|caasp|kubic|leap|sles|sled|tumbleweed( kubic)?)$/;
- $dist .= $is_tw ? 'tw' : $config{VERSION_ID};
+ my $is_tw = $dist =~ /^tumbleweed( kubic)?$/;
+
+ $dist = $is_tw ? 'tw' : "$dist$config{VERSION_ID}";
$dist =~ s/\..*$// if $dist =~ /^(sles|sled)/;
# print "dist=\"$dist\"\n";
