Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2017-06-04 01:50:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Sun Jun 4 01:50:02 2017 rev:14 rq:500548 version:14.317
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2017-05-16 14:31:12.380716439 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2017-06-04 01:50:36.474365958 +0200
@@ -0,0 +1,27 @@
+--------------------------------------------------------------------
+Fri Jun 2 08:02:07 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#186
+- etc: update module.config to match 4.12
+- 14.317
+
+-------------------------------------------------------------------
+Thu Jun 1 13:03:46 CEST 2017 - [email protected]
+
+- sle15: don't require obsolete sles-release-DVD package (bsc#1041893)
+
+--------------------------------------------------------------------
+Tue May 30 11:34:00 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#185
+- allow driver updates also to be applied to the rescue system
+ (bsc#1025621)
+- avoid build problems when different openssl versions exist
+- new skelcd-control-<BRANDING> packages have files in /usr/lib/skelcd
+- 14.316
+
+-------------------------------------------------------------------
+Mon May 29 10:16:28 CEST 2017 - [email protected]
+
+- rewrite spec file to simplify building different flavors (bsc#1039285)
+
Old:
----
installation-images-14.315.tar.xz
New:
----
installation-images-14.317.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.raUaY3/_old 2017-06-04 01:50:37.138272156 +0200
+++ /var/tmp/diff_new_pack.raUaY3/_new 2017-06-04 01:50:37.138272156 +0200
@@ -22,7 +22,6 @@
ExclusiveArch: do_not_build
%endif
-# xxx
%global flavor @BUILD_FLAVOR@%nil
%define with_vbox 0
@@ -33,30 +32,47 @@
%bcond_with xen
%bcond_with xenkmp
-# === sort out branding ===
+# === sort out which flavor to build ===
+
+%if "%flavor" == "openSUSE"
%if 0%{?is_opensuse}
+%define theme openSUSE
+%endif
+%endif
+
%if "%flavor" == "Kubic"
-%if 0%{?sle_version}
# don't build on Leap for now
-ExclusiveArch: do_not_build
-%endif
+%if 0%{?is_opensuse} && !0%{?sle_version}
%define theme Kubic
-%define product_nameX %{theme}-%{_target_cpu}
-%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
-%else
-%if "%flavor" != "openSUSE"
+%endif
+
+%if "%flavor" == "SLED"
+# build SLED only on x86_64
+%if "%{_target_cpu}" == "x86_64" && 0%{?sle_version} && !0%{?is_opensuse}
+%define theme SLED
+%endif
+%endif
+
+%if "%flavor" == "SLES"
+%if 0%{?sle_version} && !0%{?is_opensuse}
+%define theme SLES
+%endif
+%endif
+
+%if "%flavor" == "CAASP"
+%if 0%{?is_susecaasp}
+%define theme CAASP
+%endif
+%endif
+
+# === define each theme ===
+
+%if "%{?theme}" == ""
ExclusiveArch: do_not_build
%endif
-%define theme openSUSE
-%define product_nameX %{theme}-%{_target_cpu}
+
+%if "%theme" == "openSUSE"
%define branding_skelcd openSUSE
%define branding_systemd openSUSE
%define branding_plymouth openSUSE
@@ -67,63 +83,67 @@
BuildRequires: xf86-input-libinput
%endif
%endif
-%else
-%if 0%{?is_susecaasp}
-%if "%flavor" != "CAASP"
-ExclusiveArch: do_not_build
-%endif
-%define theme CAASP
-%define product_nameX %{theme}-%{_target_cpu}
+
+%if "%theme" == "Kubic"
%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
+%endif
+
+%if "%theme" == "SLED"
+%define branding_skelcd SLED
+%define branding_systemd SLE
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
-%define config_bootmenu_no_upgrade 1
-BuildRequires: caasp-release
-BuildRequires: caasp-release-DVD
-%else
-%if "%flavor" != "SLES" && "%flavor" != "SLED"
-ExclusiveArch: do_not_build
+BuildRequires: sled-release
+%if 0%{?sle_version} != 0150000
+BuildRequires: sled-release-DVD
+BuildRequires: sle12-desktop-migration
%endif
-%if "%flavor" == "SLES"
-%define theme SLES
-%define product_nameX %{theme}-%{_target_cpu}
+%endif
+
+%if "%theme" == "SLES"
%define branding_skelcd SLES
%define branding_systemd SLE
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
BuildRequires: sles-release
-BuildRequires: sles-release-DVD
%if 0%{?sle_version} != 0150000
+BuildRequires: sles-release-DVD
BuildRequires: sle12-desktop-migration
%ifarch x86_64 ppc64le
BuildRequires: sap-installation-wizard
%endif
%endif
%endif
-%if "%flavor" == "SLED"
-# SLED is x86_64 only
-ExclusiveArch: x86_64
-%define theme SLED
-%define product_nameX %{theme}-%{_target_cpu}
-%define branding_skelcd SLED
-%define branding_systemd SLE
+
+%if "%theme" == "CAASP"
+%define branding_skelcd CAASP
+%define branding_systemd CAASP
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
-BuildRequires: sled-release
-BuildRequires: sled-release-DVD
+%define config_bootmenu_no_upgrade 1
+BuildRequires: caasp-release
%if 0%{?sle_version} != 0150000
-BuildRequires: sle12-desktop-migration
-%endif
-%endif
+BuildRequires: caasp-release-DVD
%endif
%endif
+# === set product string (based on required packages) ===
+
%global product_name %(bash %_sourcedir/product_name)-%{_target_cpu}
+# === branding specific packages ===
+
BuildRequires: skelcd-control-%branding_skelcd
BuildRequires: systemd-presets-branding-%branding_systemd
%if %with_plymouth
@@ -135,6 +155,7 @@
%ifarch %ix86 x86_64 aarch64
BuildRequires: grub2-branding-%branding_grub2
%endif
+
# === branding end ===
# no i586 in Leap
@@ -487,7 +508,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.315
+Version: 14.317
Release: 0
Provides: installation-images = %version-%release
Source: installation-images-%{version}.tar.xz
++++++ installation-images-14.315.tar.xz -> installation-images-14.317.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.315/VERSION
new/installation-images-14.317/VERSION
--- old/installation-images-14.315/VERSION 2017-05-12 14:44:42.000000000
+0200
+++ new/installation-images-14.317/VERSION 2017-06-02 10:02:06.000000000
+0200
@@ -1 +1 @@
-14.315
+14.317
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.315/changelog
new/installation-images-14.317/changelog
--- old/installation-images-14.315/changelog 2017-05-12 14:44:42.000000000
+0200
+++ new/installation-images-14.317/changelog 2017-06-02 10:02:06.000000000
+0200
@@ -1,3 +1,13 @@
+2017-06-01: 14.317
+ - etc: update module.config to match 4.12
+ - It is mostly intended for developers or support to debug vsock
+ issues.
+
+2017-05-29: 14.316
+ - new skelcd-control-<BRANDING> packages have files in /usr/lib/skelcd
+ - avoid build problems when different openssl versions exist
+ - allow driver updates also to be applied to the rescue system (bsc
#1025621)
+
2017-05-12: 14.315
- build 'real' SLED theme (bsc #1038838)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.315/data/boot/tftp.file_list
new/installation-images-14.317/data/boot/tftp.file_list
--- old/installation-images-14.315/data/boot/tftp.file_list 2017-05-12
14:44:42.000000000 +0200
+++ new/installation-images-14.317/data/boot/tftp.file_list 2017-06-02
10:02:06.000000000 +0200
@@ -49,8 +49,13 @@
include gen/rpm.file_list
+# new skelcd package format: all files are below /usr/lib/skelcd
skelcd-control-<skelcd_ctrl_theme>:
- m CD1/control.xml <tftp_dir>/<instsys_dir>
+ if exists(skelcd-control-<skelcd_ctrl_theme>, /usr/lib/skelcd)
+ m usr/lib/skelcd/CD1/control.xml <tftp_dir>/<instsys_dir>
+ else
+ m CD1/control.xml <tftp_dir>/<instsys_dir>
+ endif
:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.315/data/initrd/adddir
new/installation-images-14.317/data/initrd/adddir
--- old/installation-images-14.315/data/initrd/adddir 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.317/data/initrd/adddir 2017-06-02
10:02:06.000000000 +0200
@@ -0,0 +1,76 @@
+#! /bin/bash
+
+#
+# needs: chmod chown cp ln mktemp mv readlink rm
+#
+
+
+function read_dir {
+ local i
+
+ for i in `( cd "$1" && echo .* * )` ; do
+ [ "$i" = . -o "$i" = .. ] && continue
+ [ -e "$1/$i" -o -L "$1/$i" ] && echo "$i"
+ done
+}
+
+
+function add_dir {
+ local src dst tmp i
+
+ src="$1"
+ dst="$2"
+
+ # echo "adddir $src $dst"
+
+ for i in `read_dir $src` ; do
+ if [ -d "$src/$i" -a ! -L "$src/$i" ]; then
+ # add directory
+ # echo " add dir $src/$i as $dst/$i"
+ if [ -d "$dst/$i" ] ; then
+ if [ -L "$dst/$i" ] ; then
+ tmp=`mktemp -d "$dst/adddir.XXXXXX"` || exit 2
+ chown --dereference --reference "$dst/$i" "$tmp" 2>/dev/null
+ chmod --reference "$dst/$i" "$tmp"
+ slink="`readlink $dst/$i`"
+ [ "${slink:0:1}" = / ] || slink="$dst/$slink"
+ add_dir "$slink" "$tmp"
+ rm -f "$dst/$i"
+ mv "$tmp" "$dst/$i"
+ fi
+ add_dir "$src/$i" "$dst/$i"
+ else
+ rm -f "$dst/$i"
+ ln -s "`( cd $src ; pwd )`/$i" "$dst/$i"
+ fi
+ else
+ # add non-directory
+ # echo " add file $src/$i as $dst/$i"
+ if [ -d "$dst/$i" -a ! -L "$dst/$i" ] ; then
+ rm -rf "$dst/$i"
+ else
+ rm -f "$dst/$i"
+ fi
+ if [ -f "$src/$i" -a ! -L "$src/$i" ] ; then
+ ln -s "`( cd $src ; pwd )`/$i" "$dst/$i"
+ else
+ cp -a "$src/$i" "$dst/$i"
+ fi
+ fi
+ done
+}
+
+
+src="$1"
+dst="$2"
+
+if [ ! \( -d "$src" -a -d "$dst" \) ] ; then
+ echo "Usage: adddir src_dir dst_dir"
+ echo "Adds (symlinks) everything that is in src_dir to dst_dir."
+ echo "Note: spaces in filenames are evil."
+ exit 1
+fi
+
+
+add_dir "$src" "$dst"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.315/data/initrd/initrd.file_list
new/installation-images-14.317/data/initrd/initrd.file_list
--- old/installation-images-14.315/data/initrd/initrd.file_list 2017-05-12
14:44:42.000000000 +0200
+++ new/installation-images-14.317/data/initrd/initrd.file_list 2017-06-02
10:02:06.000000000 +0200
@@ -595,6 +595,9 @@
# systemd service start script
x service_start /bin
+# the adddir script used to be in inst-sys but it's needed in initrd, too
+x adddir /sbin
+
# mini host file
x etc/host.conf etc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.315/data/initrd/scripts/prepare_rescue
new/installation-images-14.317/data/initrd/scripts/prepare_rescue
--- old/installation-images-14.315/data/initrd/scripts/prepare_rescue
2017-05-12 14:44:42.000000000 +0200
+++ new/installation-images-14.317/data/initrd/scripts/prepare_rescue
2017-06-02 10:02:06.000000000 +0200
@@ -41,6 +41,14 @@
# preserve hostname
hostname >/etc/hostname
+# driver update: add files to inst-sys
+if [ -d /mounts/initrd/update ] ; then
+ cp -r /mounts/initrd/update /
+ for i in /update/[0-9]*/inst-sys ; do
+ [ -d "$i" ] && /mounts/initrd/sbin/adddir "$i" /
+ done
+fi
+
# bash >/dev/console 2>&1
rm -f /mounts/initrd/{*,.*}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.315/data/root/etc/adddir
new/installation-images-14.317/data/root/etc/adddir
--- old/installation-images-14.315/data/root/etc/adddir 2017-05-12
14:44:42.000000000 +0200
+++ new/installation-images-14.317/data/root/etc/adddir 1970-01-01
01:00:00.000000000 +0100
@@ -1,76 +0,0 @@
-#! /bin/bash
-
-#
-# needs: chmod chown cp ln mktemp mv readlink rm
-#
-
-
-function read_dir {
- local i
-
- for i in `( cd "$1" && echo .* * )` ; do
- [ "$i" = . -o "$i" = .. ] && continue
- [ -e "$1/$i" -o -L "$1/$i" ] && echo "$i"
- done
-}
-
-
-function add_dir {
- local src dst tmp i
-
- src="$1"
- dst="$2"
-
- # echo "adddir $src $dst"
-
- for i in `read_dir $src` ; do
- if [ -d "$src/$i" -a ! -L "$src/$i" ]; then
- # add directory
- # echo " add dir $src/$i as $dst/$i"
- if [ -d "$dst/$i" ] ; then
- if [ -L "$dst/$i" ] ; then
- tmp=`mktemp -d "$dst/adddir.XXXXXX"` || exit 2
- chown --dereference --reference "$dst/$i" "$tmp" 2>/dev/null
- chmod --reference "$dst/$i" "$tmp"
- slink="`readlink $dst/$i`"
- [ "${slink:0:1}" = / ] || slink="$dst/$slink"
- add_dir "$slink" "$tmp"
- rm -f "$dst/$i"
- mv "$tmp" "$dst/$i"
- fi
- add_dir "$src/$i" "$dst/$i"
- else
- rm -f "$dst/$i"
- ln -s "`( cd $src ; pwd )`/$i" "$dst/$i"
- fi
- else
- # add non-directory
- # echo " add file $src/$i as $dst/$i"
- if [ -d "$dst/$i" -a ! -L "$dst/$i" ] ; then
- rm -rf "$dst/$i"
- else
- rm -f "$dst/$i"
- fi
- if [ -f "$src/$i" -a ! -L "$src/$i" ] ; then
- ln -s "`( cd $src ; pwd )`/$i" "$dst/$i"
- else
- cp -a "$src/$i" "$dst/$i"
- fi
- fi
- done
-}
-
-
-src="$1"
-dst="$2"
-
-if [ ! \( -d "$src" -a -d "$dst" \) ] ; then
- echo "Usage: adddir src_dir dst_dir"
- echo "Adds (symlinks) everything that is in src_dir to dst_dir."
- echo "Note: spaces in filenames are evil."
- exit 1
-fi
-
-
-add_dir "$src" "$dst"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.315/data/root/root.file_list
new/installation-images-14.317/data/root/root.file_list
--- old/installation-images-14.315/data/root/root.file_list 2017-05-12
14:44:42.000000000 +0200
+++ new/installation-images-14.317/data/root/root.file_list 2017-06-02
10:02:06.000000000 +0200
@@ -362,6 +362,9 @@
if exists(openssl, /usr/share/ssl)
openssl:
else
+ # FIXME: for now, ignore old version, else the solver will have multiple
+ # choices and things go down...
+ openssl-1_0_0: ignore
openssl-*:
endif
/usr/share/ssl
@@ -661,10 +664,8 @@
x /usr/lib/YaST/.Reh /usr/lib/YaST2
x etc/inst_setup /sbin/inst_setup
-x etc/adddir /sbin/adddir
x hostip_from_wicked /sbin/hostip_from_wicked
c 755 0 0 /sbin/inst_setup
-c 755 0 0 /sbin/adddir
c 755 0 0 /sbin/hostip_from_wicked
if instsys_complain_root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.315/data/root/zenroot.file_list
new/installation-images-14.317/data/root/zenroot.file_list
--- old/installation-images-14.315/data/root/zenroot.file_list 2017-05-12
14:44:42.000000000 +0200
+++ new/installation-images-14.317/data/root/zenroot.file_list 2017-06-02
10:02:06.000000000 +0200
@@ -250,10 +250,8 @@
r root mnt tmp proc usr/libexec
x etc/inst_setup /sbin/inst_setup
-x etc/adddir /sbin/adddir
x hostip_from_wicked /sbin/hostip_from_wicked
c 755 0 0 /sbin/inst_setup
-c 755 0 0 /sbin/adddir
c 755 0 0 /sbin/hostip_from_wicked
x /etc/ld.so.conf /etc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.315/etc/module.config
new/installation-images-14.317/etc/module.config
--- old/installation-images-14.315/etc/module.config 2017-05-12
14:44:42.000000000 +0200
+++ new/installation-images-14.317/etc/module.config 2017-06-02
10:02:06.000000000 +0200
@@ -635,3 +635,4 @@
veth
vmwatchdog
vrf
+vsockmon
