- dbus-launch moved into dbus-1; we don't need it

- we need yet another branding config var
- use new theme variables to adjust branding
- libsystemd is a separate package meanwhile
- drop obsolete xf86-video-modesetting, make xf86-input-libinput optional
- /etc/issue is no longer available in casp, use our own
- remove /etc/issue from root image (it's in initrd aleady)
- adjust zypp.conf for CASP (fate#321764)
- remove support for obsolete pango-modules package
- start rsyslogd in inst_setup if not already running
- add CASP branding to test iso
- add CASP branding to x86 install script
- sanitize config variable expansion code
- allow arbitrary theme config settings
- support casp in dud directory calculation
- adjust kernel module config
- keep sample CASP os-release for reference and testing
- add more fine-grained control over branding
- cleanup Makefile: remove obsolete stuff
- add our own /etc/issue for rescue system
- delete obsolete files
- 14.285

OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=949

installation-images-14.284.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af73d7820d329758f333b8b27bf63ad5a58f1b2b9a1321ac03749c636691537f
-size 167432

installation-images-14.285.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:def8d23ac5b86d5e7703e49f1aa30f997fad84a33b61dd722f2caefe04648e33
+size 168044

installation-images.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Dec  9 15:40:34 CET 2016 - snwint@suse.com
+
+- dbus-launch moved into dbus-1; we don't need it
+- we need yet another branding config var
+- use new theme variables to adjust branding
+- libsystemd is a separate package meanwhile
+- drop obsolete xf86-video-modesetting, make xf86-input-libinput optional
+- /etc/issue is no longer available in casp, use our own
+- remove /etc/issue from root image (it's in initrd aleady)
+- adjust zypp.conf for CASP (fate#321764)
+- remove support for obsolete pango-modules package
+- start rsyslogd in inst_setup if not already running
+- add CASP branding to test iso
+- add CASP branding to x86 install script
+- sanitize config variable expansion code
+- allow arbitrary theme config settings
+- support casp in dud directory calculation
+- adjust kernel module config
+- keep sample CASP os-release for reference and testing
+- add more fine-grained control over branding
+- cleanup Makefile: remove obsolete stuff
+- add our own /etc/issue for rescue system
+- delete obsolete files
+- 14.285
+
 -------------------------------------------------------------------
 Tue Dec  6 10:56:48 CET 2016 - snwint@suse.com
 

installation-images.spec

@@ -18,12 +18,6 @@
 # needsbinariesforbuild
 
 
-%if 0%{?is_opensuse}
-%define theme openSUSE
-%else
-%define theme SLES
-%endif
-
 %define with_vbox 0
 %define with_plymouth 1
 %define with_shim 1
@@ -32,18 +26,51 @@
 %bcond_with xen
 %bcond_with xenkmp
 
-# no i586 in Leap
+# ===  sort out branding  ===
-%if %suse_version == 1315
+%if 0%{?is_opensuse}
-ExcludeArch: %ix86
+%define theme openSUSE
-%endif
+%define branding openSUSE
-%if %theme == SLES
+%define branding2 openSUSE
+BuildRequires: openSUSE-release
+BuildRequires: xf86-input-libinput
+%else
+%if 0%{?is_susecasp}
+%define theme CASP
+%define branding SLE
+%define branding2 CASP
+%define config_bootmenu_no_upgrade 1
+BuildRequires: casp-release
+BuildRequires: casp-release-DVD
+%else
+%define theme SLES
+%define branding SLE
+%define branding2 SLES
+BuildRequires: sles-release
 BuildRequires: sle12-desktop-migration
 %ifarch x86_64 ppc64le
 BuildRequires: sap-installation-wizard
 %endif
 %endif
-BuildRequires:  distribution-release
+%endif
-BuildConflicts: dummy-release
+
+BuildRequires: skelcd-control-%branding2
+BuildRequires: systemd-presets-branding-%branding
+%if %with_plymouth
+BuildRequires: plymouth-branding-%branding
+%endif
+%ifarch %ix86 x86_64
+BuildRequires: gfxboot-branding-%branding
+%endif
+%ifarch %ix86 x86_64 aarch64
+BuildRequires: grub2-branding-%branding
+%endif
+# ===  branding end  ===
+
+# no i586 in Leap
+%if %suse_version == 1315
+ExcludeArch: %ix86
+%endif
+
 BuildRequires:  noto-sans-fonts
 BuildRequires:  google-roboto-fonts 
 %ifarch ia64 %ix86 x86_64
@@ -231,9 +258,6 @@ BuildRequires:  util-linux
 BuildRequires:  util-linux-systemd
 BuildRequires:  ltrace
 BuildRequires:  valgrind
-# TODO: this is probably superfluous as the kiwi file is meant to
-# pull in the right control file
-BuildRequires:  product_control
 BuildRequires:  vim
 BuildRequires:  wget
 BuildRequires:  wicked
@@ -291,7 +315,6 @@ BuildRequires:  iprutils
 BuildRequires:  kbd
 BuildRequires:  xf86-input-evdev
 BuildRequires:  xf86-input-synaptics
-BuildRequires:  xf86-input-libinput
 %ifarch %ix86 x86_64
 BuildRequires:  xf86-video-intel
 BuildRequires:  xf86-video-vmware
@@ -378,7 +401,7 @@ ExcludeArch:    %arm
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.284
+Version:        14.285
 Release:        0
 Provides:       installation-images-%theme = %version-%release
 Source:         installation-images-%{version}.tar.xz
@@ -433,6 +456,10 @@ export instsys_complain=1
 # export instsys_complain_root=2
 # beta only: ignore non-critical errors
 # export debug=ignore
+# remove 'upgrade' option from boot menu
+%if 0%{?config_bootmenu_no_upgrade}
+export BOOTMENU_NO_UPGRADE=1
+%endif
 make THEMES=%theme
 %ifarch %ix86 x86_64
 %if %{with xen}