Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2017-03-05 17:59:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Sun Mar 5 17:59:14 2017 rev:9 rq:473786 version:14.304
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2017-02-22 13:44:19.610968223 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2017-03-05 17:59:15.328143248 +0100
@@ -1,0 +2,17 @@
+Fri Mar 3 12:26:05 UTC 2017 - [email protected]
+
+- copy the correct modprobe blacklist files to rescue system (bsc#1023023)
+- 14.304
+
+-------------------------------------------------------------------
+Thu Mar 2 10:05:22 UTC 2017 - [email protected]
+
+- ensure lvm config files are writable
+- 14.303
+
+-------------------------------------------------------------------
+Thu Mar 2 10:11:59 CET 2017 - [email protected]
+
+- change tftpboot-installation subpackages to contain product in package name
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.302.tar.xz
New:
----
installation-images-14.304.tar.xz
product_name
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.sHrAXK/_old 2017-03-05 17:59:15.904061732 +0100
+++ /var/tmp/diff_new_pack.sHrAXK/_new 2017-03-05 17:59:15.904061732 +0100
@@ -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 @@
%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-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 @@
%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 @@
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 @@
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
++++++ installation-images-14.302.tar.xz -> installation-images-14.304.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.302/VERSION
new/installation-images-14.304/VERSION
--- old/installation-images-14.302/VERSION 2017-02-20 18:14:38.000000000
+0100
+++ new/installation-images-14.304/VERSION 2017-03-03 13:23:57.000000000
+0100
@@ -1 +1 @@
-14.302
+14.304
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.302/changelog
new/installation-images-14.304/changelog
--- old/installation-images-14.302/changelog 2017-02-20 18:14:38.000000000
+0100
+++ new/installation-images-14.304/changelog 2017-03-03 13:23:57.000000000
+0100
@@ -1,3 +1,9 @@
+2017-03-03: 14.304
+ - copy the correct modprobe blacklist files to rescue system (bsc
#1023023)
+
+2017-03-02: 14.303
+ - ensure lvm config files are writable
+
2017-02-20: 14.302
- fix install script to move the correct files (fate #322275)
- enhance tftpboot-installation package to include all files needed to
build our installation iso
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.302/data/initrd/initrd.file_list
new/installation-images-14.304/data/initrd/initrd.file_list
--- old/installation-images-14.302/data/initrd/initrd.file_list 2017-02-20
18:14:38.000000000 +0100
+++ new/installation-images-14.304/data/initrd/initrd.file_list 2017-03-03
13:23:57.000000000 +0100
@@ -394,6 +394,10 @@
/var/lib/autoinstall
/var/adm/autoinstall
+# we just need the config files here to ensure they will be writable
+lvm2: nodeps
+ /etc
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
# packages with scripts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.302/data/initrd/scripts/prepare_rescue
new/installation-images-14.304/data/initrd/scripts/prepare_rescue
--- old/installation-images-14.302/data/initrd/scripts/prepare_rescue
2017-02-20 18:14:38.000000000 +0100
+++ new/installation-images-14.304/data/initrd/scripts/prepare_rescue
2017-03-03 13:23:57.000000000 +0100
@@ -29,7 +29,7 @@
# keep some initrd config files for rescue system
cd /mounts/initrd
-for i in etc/modprobe.d/blacklist etc/modprobe.d/noload etc/resolv.conf
etc/sysconfig/network/* root/.ssh ; do
+for i in etc/modprobe.d/blacklist.conf etc/modprobe.d/noload.conf
etc/resolv.conf etc/sysconfig/network/* root/.ssh ; do
[ -f "$i" ] && cp -f "$i" "/$i"
[ -d "$i" ] && cp -fr --parents "$i" /
done
++++++ product_name ++++++
#! /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
