Accepting request 473786 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/473786
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=9

installation-images-14.302.tar.xz

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

installation-images-14.304.tar.xz

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

installation-images.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Mar  3 12:26:05 UTC 2017 - snwint@suse.com
+
+- copy the correct modprobe blacklist files to rescue system (bsc#1023023)
+- 14.304
+
+-------------------------------------------------------------------
+Thu Mar  2 10:05:22 UTC 2017 - snwint@suse.com
+
+- ensure lvm config files are writable
+- 14.303
+
+-------------------------------------------------------------------
+Thu Mar  2 10:11:59 CET 2017 - snwint@suse.de
+
+- change tftpboot-installation subpackages to contain product in package name
+
 -------------------------------------------------------------------
 Mon Feb 20 17:15:25 UTC 2017 - snwint@suse.com
 

installation-images.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package installation-images
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
 # ===  sort out branding  ===
 %if 0%{?is_opensuse}
 %define theme openSUSE
-%define product_name %{theme}-%{_target_cpu}
+%define product_nameX %{theme}-%{_target_cpu}
 %define branding_skelcd   openSUSE
 %define branding_systemd  openSUSE
 %define branding_plymouth openSUSE
@@ -42,7 +42,7 @@ BuildRequires:  xf86-input-libinput
 %else
 %if 0%{?is_susecaasp}
 %define theme CAASP
-%define product_name %{theme}-%{_target_cpu}
+%define product_nameX %{theme}-%{_target_cpu}
 %define branding_skelcd   CASP
 %define branding_systemd  CAASP
 %define branding_plymouth SLE
@@ -53,7 +53,7 @@ BuildRequires:  caasp-release
 BuildRequires:  caasp-release-DVD
 %else
 %define theme SLES
-%define product_name %{theme}-%{_target_cpu}
+%define product_nameX %{theme}-%{_target_cpu}
 %define branding_skelcd   SLES
 %define branding_systemd  SLE
 %define branding_plymouth SLE
@@ -71,6 +71,8 @@ BuildRequires:  sap-installation-wizard
 %endif
 %endif
 
+%global product_name %(bash %_sourcedir/product_name)-%{_target_cpu}
+
 BuildRequires:  skelcd-control-%branding_skelcd
 BuildRequires:  systemd-presets-branding-%branding_systemd
 %if %with_plymouth
@@ -425,11 +427,12 @@ ExcludeArch:    %arm
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.302
+Version:        14.304
 Release:        0
 Provides:       installation-images-%theme = %version-%release
 Source:         %{name}-%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
+Source2:        product_name
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _binary_payload w.ufdio
 
@@ -481,6 +484,7 @@ Package that holds debuginfo dependencies for image files in installation-image.
 rm -f /usr/lib/build/checks/04-check-filelist
 
 %build
+echo building product "'%product_name'"
 unset MALLOC_CHECK_
 BUILD_DISTRIBUTION_NAME="%distribution"
 export BUILD_DISTRIBUTION_NAME

product_name

@@ -0,0 +1,20 @@
+#! /bin/bash
+
+# print product name
+
+if [ -f /usr/lib/os-release ] ; then
+  . /usr/lib/os-release
+else
+  . /etc/os-release
+fi
+
+prod="$NAME"
+[ -n "$VERSION" ] && prod="$prod-$VERSION"
+
+# kill parentheses...
+prod=${prod//[()]/}
+
+# ... and spaces
+prod=${prod// /-}
+
+echo $prod