Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2017-05-06 20:46:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Sat May 6 20:46:24 2017 rev:12 rq:493015 version:14.312
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2017-04-11 12:40:01.214194513 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2017-05-06 20:46:26.201905175 +0200
@@ -0,0 +1,59 @@
+--------------------------------------------------------------------
+Fri May 5 13:20:12 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#181
+- added Kubic theme
+- rename skelcd-control-CASP to *-CAASP
+- calculate driver update path for Kubic release
+- 14.312
+
+-------------------------------------------------------------------
+Fri Apr 28 16:44:27 CEST 2017 - [email protected]
+
+- fix spec file
+
+--------------------------------------------------------------------
+Fri Apr 28 13:04:18 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#179
+- add Mesa-libGL1 (bsc#1035770)
+- 14.311
+
+--------------------------------------------------------------------
+Wed Apr 26 12:21:03 UTC 2017 - [email protected]
+
+- enhance documentation
+- add password bug warning
+- merge gh#openSUSE/installation-images#178
+- some doc adjustments
+- 14.310
+
+--------------------------------------------------------------------
+Tue Apr 25 13:19:29 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#177
+- add dwc2 module (bsc#1035999)
+- 14.309
+
+--------------------------------------------------------------------
+Fri Apr 21 14:57:47 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#176
+- Ignore python2-setuptools package instead of python-setuptools
+- 14.308
+
+-------------------------------------------------------------------
+Tue Apr 18 10:32:05 UTC 2017 - [email protected]
+
+- SLED fixes:
+ * build only on x86_64 (bsc#1034595)
+ * do not include the SAP installation wizard
+
+-------------------------------------------------------------------
+Tue Apr 11 16:03:29 CEST 2017 - [email protected]
+
+- change package name (again) to contain "-<THEME>" (fate#322275)
+- use osc multibuild feature
+- new skelcd-installer-<THEME> sub-package that will become the default
+ in the future (bsc#1031335)
+
Old:
----
installation-images-14.307.tar.xz
New:
----
_multibuild
installation-images-14.312.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.8cGnHQ/_old 2017-05-06 20:46:26.909805314 +0200
+++ /var/tmp/diff_new_pack.8cGnHQ/_new 2017-05-06 20:46:26.913804749 +0200
@@ -1,7 +1,7 @@
#
# spec file for package installation-images
#
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,6 +18,13 @@
# needsbinariesforbuild
+%if "@BUILD_FLAVOR@" == ""
+ExclusiveArch: do_not_build
+%endif
+
+# xxx
+%global flavor @BUILD_FLAVOR@%nil
+
%define with_vbox 0
%define with_plymouth 1
%define with_shim 1
@@ -28,6 +35,22 @@
# === sort out branding ===
%if 0%{?is_opensuse}
+%if "%flavor" == "Kubic"
+%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"
+ExclusiveArch: do_not_build
+%endif
%define theme openSUSE
%define product_nameX %{theme}-%{_target_cpu}
%define branding_skelcd openSUSE
@@ -39,11 +62,15 @@
%ifnarch s390x
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}
-%define branding_skelcd CASP
+%define branding_skelcd CAASP
%define branding_systemd CAASP
%define branding_plymouth SLE
%define branding_grub2 SLE
@@ -52,6 +79,10 @@
BuildRequires: caasp-release
BuildRequires: caasp-release-DVD
%else
+%if "%flavor" != "SLES" && "%flavor" != "SLED"
+ExclusiveArch: do_not_build
+%endif
+%if "%flavor" == "SLES"
%define theme SLES
%define product_nameX %{theme}-%{_target_cpu}
%define branding_skelcd SLES
@@ -68,6 +99,23 @@
%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 SLES
+%define branding_systemd SLE
+%define branding_plymouth SLE
+%define branding_grub2 SLE
+%define branding_gfxboot SLE
+BuildRequires: sled-release
+BuildRequires: sled-release-DVD
+%if 0%{?sle_version} != 0130000
+BuildRequires: sle12-desktop-migration
+%endif
+%endif
+%endif
%endif
%global product_name %(bash %_sourcedir/product_name)-%{_target_cpu}
@@ -97,6 +145,7 @@
%endif
BuildRequires: Mesa
BuildRequires: Mesa-libEGL1
+BuildRequires: Mesa-libGL1
BuildRequires: SuSEfirewall2
BuildRequires: aaa_base
BuildRequires: aaa_base-extras
@@ -160,6 +209,7 @@
BuildRequires: icmpinfo
BuildRequires: indic-fonts
BuildRequires: initviocons
+BuildRequires: insserv-compat
BuildRequires: ipa-gothic-fonts
BuildRequires: iproute2
BuildRequires: iputils
@@ -420,27 +470,33 @@
# our images are not reproducible and it's taking time
#!BuildIgnore: build-compare
+%if "@BUILD_FLAVOR@" == ""
+# This package is never built - but it helps the bots seeing that this package
+# is intentionally as messed up as it is
Name: installation-images
+%else
+Name: installation-images-%{theme}
+%endif
AutoReqProv: off
ExcludeArch: %arm
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.307
+Version: 14.312
Release: 0
-Provides: installation-images-%theme = %version-%release
-Source: %{name}-%{version}.tar.xz
-Source1: %{name}-rpmlintrc
+Provides: installation-images = %version-%release
+Source: installation-images-%{version}.tar.xz
+Source1: installation-images-rpmlintrc
Source2: product_name
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
-%description
+%description -n installation-images-%{theme}
Files needed for %theme installation media.
-%package -n install-initrd
-Provides: install-initrd-%theme = %version-%release
+%package -n install-initrd-%{theme}
+Provides: install-initrd = %version-%release
Obsoletes: install-initrd-%theme < %version-%release
Obsoletes: install-initrd-branding-%theme < %version-%release
AutoReqProv: off
@@ -448,7 +504,7 @@
Group: System/Kernel
PreReq: /bin/ln
-%description -n install-initrd
+%description -n install-initrd-%{theme}
You can create an initrd for %theme installation. Useful, for example, to set
up a UML or XEN environment.
@@ -458,20 +514,29 @@
Summary: tftp installation tree
Group: System/Management
BuildArch: noarch
-PreReq: /bin/ln
%description -n tftpboot-installation-%{product_name}
This package contains the kernel, initrd and installation images
to install SUSE CaaS Platform with PXE boot/tftpboot on x86-64.
-%package -n installation-images-debuginfodeps
-Provides: installation-images-debuginfodeps-%theme = %version-%release
+%package -n skelcd-installer-%{theme}
+AutoReqProv: off
+Summary: installer and related files needed on dvd1
+Group: Metapackages
+
+%description -n skelcd-installer-%{theme}
+This package contains kernel, initrd and installation images
+needed on the first product dvds to start an installation.
+
+
+%package -n installation-images-debuginfodeps-%{theme}
+Provides: installation-images-debuginfodeps = %version-%release
Obsoletes: installation-images-debuginfodeps-%theme < %version-%release
Summary: Debuginfo dependencies for %theme installation-images
Group: Metapackages
-%description -n installation-images-debuginfodeps
+%description -n installation-images-debuginfodeps-%{theme}
Package that holds debuginfo dependencies for image files in
installation-image.
@@ -547,8 +612,11 @@
echo '%ghost' /usr/lib/install-initrd/branding >>install-initrd.files
echo '%dir' /usr/lib/install-initrd >>install-initrd.files
echo /usr/sbin/mkinstallinitrd >>install-initrd.files
+mkdir -p %{buildroot}/usr/lib/skelcd/CD1
+cp -a %{buildroot}/srv/tftpboot/*/* %{buildroot}/usr/lib/skelcd/CD1
+rm -rf %{buildroot}/usr/lib/skelcd/CD1/{README,net}
-%post -n install-initrd
+%post -n install-initrd-%{theme}
/bin/ln -snf %theme /usr/lib/install-initrd/branding 2>/dev/null || true
%clean
@@ -561,14 +629,18 @@
%exclude /usr/share/debuginfodeps
/usr/share
-%files -n install-initrd -f install-initrd.files
+%files -n install-initrd-%{theme} -f install-initrd.files
%files -n tftpboot-installation-%{product_name}
%defattr(-,root,root)
%dir %attr(0750,tftp,tftp) /srv/tftpboot
/srv/tftpboot
-%files -n installation-images-debuginfodeps
+%files -n skelcd-installer-%{theme}
+%defattr(-,root,root)
+/usr/lib/skelcd/CD1
+
+%files -n installation-images-debuginfodeps-%{theme}
%defattr(-,root,root)
/usr/share/debuginfodeps
++++++ _multibuild ++++++
<multibuild>
<package>openSUSE</package>
<package>SLES</package>
<package>SLED</package>
<package>CAASP</package>
<package>Kubic</package>
</multibuild>
++++++ installation-images-14.307.tar.xz -> installation-images-14.312.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/README.md
new/installation-images-14.312/README.md
--- old/installation-images-14.307/README.md 2017-04-05 11:01:13.000000000
+0200
+++ new/installation-images-14.312/README.md 2017-05-05 15:20:12.000000000
+0200
@@ -1,9 +1,53 @@
# (open)SUSE installation images
-## Documentation
+## Overview
-Scripts and tools to generate the disk images used during installation
-(inst-sys) and the rescue disk images for openSUSE and SUSE.
+installation-images builds the SUSE installation system. This includes the
installer itself and
+everything it needs to run an installation (except for the actual package
repository). This also
+includes the boot loader configuration used on our installation media.
-Further information can be found at
[ReadTheDocs.org](http://installation-images.readthedocs.org/) or
-reading the [doc sources](doc).
+To give you an impression what we are talking about here, here's a (a bit
shortened) listing
+of the relevant files on an x86_64 installation dvd:
+
+```sh
+drwxr-xr-x 19 Jun 20 2016 boot
+drwxr-xr-x 137 Apr 26 12:16 boot/x86_64
+-rw-r--r-- 2097152 Jun 20 2016 boot/x86_64/libstoragemgmt
+-rw-r--r-- 3870720 Nov 9 16:21 boot/x86_64/efi
+drwxr-xr-x 83 Apr 26 12:28 boot/x86_64/loader
+-rw-r--r-- 94205880 Aug 9 2016 boot/x86_64/loader/initrd
+-rw-r--r-- 6293536 Jun 20 2016 boot/x86_64/loader/linux
+-rw-r--r-- 24576 Apr 26 12:26 boot/x86_64/loader/isolinux.bin
+-rw-r--r-- 826 Apr 26 12:26 boot/x86_64/loader/isolinux.cfg
+-rw-r--r-- 2079 Jun 20 2016 boot/x86_64/config
+-rw-r--r-- 62455808 Jun 20 2016 boot/x86_64/root
+-rw-r--r-- 76480512 Jun 20 2016 boot/x86_64/common
+-rw-r--r-- 19726336 Jun 20 2016 boot/x86_64/rescue
+-rw-r--r-- 1572864 Jun 20 2016 boot/x86_64/bind
+-rw-r--r-- 22740992 Jun 20 2016 boot/x86_64/gdb
+drwxr-xr-x 19 Apr 26 12:27 boot/x86_64/grub2-efi
+drwxr-xr-x 21 Apr 26 12:27 boot/x86_64/grub2-efi/themes
+drwxr-xr-x 6 Apr 26 12:27 boot/x86_64/grub2-efi/themes/openSUSE
+drwxr-xr-x 17 Jun 20 2016 EFI
+drwxr-xr-x 88 Nov 9 16:21 EFI/BOOT
+-rwxr-xr-x 1155520 Jun 20 2016 EFI/BOOT/bootx64.efi
+-rw-r--r-- 2638 Nov 9 16:21 EFI/BOOT/grub.cfg
+-rw-r--r-- 975712 Jun 20 2016 EFI/BOOT/grub.efi
+```
+
+You can see the kernel (`linux`), the `initrd`, boot loader files belonging to
`isolinux` and `grub2`, and
+files like `root`, `rescue`, `common` that are
+[squashfs](http://www.tldp.org/HOWTO/SquashFS-HOWTO)
+images containing the installation system with
+the [YaST](https://en.opensuse.org/Portal:YaST) installer.
+
+If you are going to work on this project, have a look at the documentaion
first:
+
+- [General intro](doc/index.md)
+- [Submitting changes to SUSE Build Service](doc/submitting.md)
+- [Modifying the branding](doc/branding.md)
+- [Config options for generating the images](doc/configoptions.md)
+- [Adding packages and files to the installation system](doc/files.md)
+- [Kernel modules](doc/modules.md)
+
+You can also read this at
[ReadTheDocs](http://installation-images.readthedocs.io/).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/VERSION
new/installation-images-14.312/VERSION
--- old/installation-images-14.307/VERSION 2017-04-05 11:01:13.000000000
+0200
+++ new/installation-images-14.312/VERSION 2017-05-05 15:20:12.000000000
+0200
@@ -1 +1 @@
-14.307
+14.312
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/changelog
new/installation-images-14.312/changelog
--- old/installation-images-14.307/changelog 2017-04-05 11:01:13.000000000
+0200
+++ new/installation-images-14.312/changelog 2017-05-05 15:20:12.000000000
+0200
@@ -1,3 +1,22 @@
+2017-05-05: 14.312
+ - calculate driver update path for Kubic release
+ - rename skelcd-control-CASP to *-CAASP
+ - added Kubic theme
+
+2017-04-28: 14.311
+ - add Mesa-libGL1 (bsc #1035770)
+
+2017-04-26: 14.310
+ - some doc adjustments
+ - add password bug warning
+ - enhance documentation
+
+2017-04-25: 14.309
+ - add dwc2 module (bsc #1035999)
+
+2017-04-21: 14.308
+ - Ignore python2-setuptools package instead of python-setuptools
+
2017-04-05: 14.307
- adjust virtio module config (bsc #1028369)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/data/root/root.file_list
new/installation-images-14.312/data/root/root.file_list
--- old/installation-images-14.307/data/root/root.file_list 2017-04-05
11:01:13.000000000 +0200
+++ new/installation-images-14.312/data/root/root.file_list 2017-05-05
15:20:12.000000000 +0200
@@ -81,7 +81,7 @@
pam-config: ignore
permissions: ignore
pinentry: ignore
-python-setuptools: ignore
+python2-setuptools: ignore
sessreg: ignore
shared-mime-info: ignore
update-alternatives: ignore
@@ -511,6 +511,7 @@
/
endif
+Mesa-libGL*:
Mesa-libEGL*:
libgbm*:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/doc/branding.md
new/installation-images-14.312/doc/branding.md
--- old/installation-images-14.307/doc/branding.md 2017-04-05
11:01:13.000000000 +0200
+++ new/installation-images-14.312/doc/branding.md 2017-05-05
15:20:12.000000000 +0200
@@ -1,22 +1,25 @@
# How the branding works
-**TODO: the whole content of this file is outdated (copied from a file 13 years
-old). It should be replaced by a similar file describing how the branding works
-nowadays.**
+To add a new theme, add a new `Theme` section to etc/config. Example for theme
+`SLES`:
-To add a new theme, add a new 'Theme' section to etc/config. Example for theme
-'SuSE-SLES':
-
-```
-[Theme SuSE-SLES]
-yast = SuSELinux # yast2 theme: yast2-theme-SuSELinux
-splash = SuSE-SLES # splash theme:
bootsplash-theme-SuSE-SLES
-product = SuSE Linux # product name (for linuxrc)
-update = /linux/suse/<arch>-<ul> # driver update dir
-image = 96 # memory limit for loading inst-sys: 96
MB
+```sh
+[Theme SLES]
+image = 600 # memory limit for loading inst-sys:
600 MB
+# other entries are branding prefixes or suffixes to branding-related packages
+release = sles # sles-release.rpm
+skelcd = sles # skelcd-sles.rpm
+skelcd_ctrl = SLES # skelcd-control-SLES.rpm
+gfxboot = SLE # gfxboot-branding-SLE.rpm
+grub2 = SLE # grub2-branding-SLE.rpm
+plymouth = SLE # plymouth-branding-SLE.rpm
+systemd = SLE # systemd-presets-branding-SLE.rpm
+yast = SLE # yast2-theme-SLE.rpm
```
-- ```<arch>```: replaced with architecture ('i386')
-- ```<rel>```: replaced with release number ('8.2')
-- ```<ul>```: replaced with UL release tag ('ul1')
-- ```<sles>```: replaced with SLES release tag ('sles8')
+Then add an appropriate theme section to `installation-images.spec`.
+
+Note that the actual product name and path for driver updates are
+auto-generated from `/usr/lib/os-release`. For completely new products
+you'll have to adjust `lib/ReadConfig.pm::get_version_info` and please also
+leave a sample of the `os-release` file in `etc/os_sample.txt`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/doc/configoptions.md
new/installation-images-14.312/doc/configoptions.md
--- old/installation-images-14.307/doc/configoptions.md 2017-04-05
11:01:13.000000000 +0200
+++ new/installation-images-14.312/doc/configoptions.md 2017-05-05
15:20:12.000000000 +0200
@@ -1,5 +1,11 @@
# Environment variables to configure boot/root/rescue images
+Images are eventually generated by the `bin/mk_image` script which uses file
lists as defined
+in `data/*/*.file_list` (see [file list docu](files.md)).
+
+The options here are environment variables used by `mk_image`. They are
typically set in `Makefile`.
+
+
## General options
- cache=1|2|4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/doc/index.md
new/installation-images-14.312/doc/index.md
--- old/installation-images-14.307/doc/index.md 2017-04-05 11:01:13.000000000
+0200
+++ new/installation-images-14.312/doc/index.md 2017-05-05 15:20:12.000000000
+0200
@@ -23,6 +23,13 @@
`make iso` will directly create the .iso file for cd1
+> ### Warning
+>
+> _There's currently a bug preventing communication to the Build Service if
your
+> password contains 'too weird' characters like spaces or some special
symbols._
+>
+> `make` will just not work, then.
+
## Configuring the generation of images
The exact behavior of ```make``` can be influenced by several environment
@@ -31,21 +38,10 @@
## Committing changes to (open)SUSE
-**NOTE: we discussed here something about a hack to exclude branding in some
cases**
-
-Every time a new commit is integrated into the master branch of the repository,
-a new submit request is created in the openSUSE Build Service for the
-[corresponding
package](https://build.opensuse.org/package/show/openSUSE:Factory/installation-images-openSUSE).
-
-A similar procedure is set in other branches of this repository, making
possible
-to submit changes to other products and versions as well.
-
-* Branch ```sl_11.1``` SUSE Enterprise 11 SP4.
-* Branch ```sle12``` SUSE Enterprise 12.
-* Branch ```master``` Factory and SUSE Enterprise 12 SP1.
+Basically every new commit into the master branch of the repository will be
auto-submitted
+to all current SUSE products. No further action is needed except accepting the
pull request.
-You can find more information about this workflow in the [linuxrc-devtools
-documentation](https://github.com/openSUSE/linuxrc-devtools#opensuse-development).
+For details see [here](submitting.md).
## Anatomy of the images
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/doc/submitting.md
new/installation-images-14.312/doc/submitting.md
--- old/installation-images-14.307/doc/submitting.md 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.312/doc/submitting.md 2017-05-05
15:20:12.000000000 +0200
@@ -0,0 +1,32 @@
+## Submitting changes to SUSE Build Service
+
+Submissions are managed by a SUSE internal [jenkins](https://jenkins.io) node
in the InstallTools tab.
+
+Each time a new commit is integrated into the master branch of the repository,
+a new submit request is created to the openSUSE Build Service. The devel
project
+is
[system:install:head](https://build.opensuse.org/package/show/system:install:head/installation-images).
+
+For maintained branches, the package is submitted to a devel project but the
final submission
+must be triggered manually.
+
+`*.changes` and version numbers are auto-generated from git commits, you don't
have to worry about this.
+
+The spec file is maintained in the Build Service only. If you need to change
it for the `master` branch,
+submit to the
+[devel
project](https://build.opensuse.org/package/show/system:install:head/installation-images)
+in the build service directly.
+
+The current names of the devel projects for other branches can be seen in the
jenkins logs.
+
+Development happens mainly in the `master` branch. The branch is used for all
current products.
+
+In rare cases branching was unavoidable:
+
+* branch `sl_11.1`: SLE 11 SP4.
+* branch `sle12`: SLE 12.
+* branch `sle12-sp2`: SLE 12 SP2.
+
+You can find more information about the changes auto-generation and the
+tools used for jenkis submissions in the [linuxrc-devtools
+documentation](https://github.com/openSUSE/linuxrc-devtools#opensuse-development).
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/etc/config
new/installation-images-14.312/etc/config
--- old/installation-images-14.307/etc/config 2017-04-05 11:01:13.000000000
+0200
+++ new/installation-images-14.312/etc/config 2017-05-05 15:20:12.000000000
+0200
@@ -116,13 +116,23 @@
image = 600
release = caasp
skelcd = casp
-skelcd_ctrl = CASP
+skelcd_ctrl = CAASP
yast = SLE
gfxboot = SLE
grub2 = SLE
plymouth = SLE
systemd = CAASP
+[Theme Kubic]
+image = 350
+release = openSUSE-Kubic
+skelcd = openSUSE
+skelcd_ctrl = CAASP
+yast = openSUSE
+gfxboot = openSUSE
+grub2 = openSUSE
+plymouth = openSUSE
+systemd = CAASP
[Theme Zen]
image = 600
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/etc/module.config
new/installation-images-14.312/etc/module.config
--- old/installation-images-14.307/etc/module.config 2017-04-05
11:01:13.000000000 +0200
+++ new/installation-images-14.312/etc/module.config 2017-05-05
15:20:12.000000000 +0200
@@ -368,6 +368,7 @@
kernel/drivers/usb/host/.*,,,,usbhid
kernel/drivers/usb/serial/.*
kernel/drivers/usb/storage/.*
+kernel/drivers/usb/dwc2/.*
kernel/drivers/usb/dwc3/.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/etc/module.list
new/installation-images-14.312/etc/module.list
--- old/installation-images-14.307/etc/module.list 2017-04-05
11:01:13.000000000 +0200
+++ new/installation-images-14.312/etc/module.list 2017-05-05
15:20:12.000000000 +0200
@@ -243,6 +243,7 @@
kernel/drivers/i2c/
kernel/drivers/nvme/
kernel/drivers/nvdimm/
+kernel/drivers/usb/dwc2/
kernel/drivers/usb/dwc3/
kernel/drivers/usb/core/ledtrig-usbport.ko
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/etc/os_sample.txt
new/installation-images-14.312/etc/os_sample.txt
--- old/installation-images-14.307/etc/os_sample.txt 2017-04-05
11:01:13.000000000 +0200
+++ new/installation-images-14.312/etc/os_sample.txt 2017-05-05
15:20:12.000000000 +0200
@@ -50,6 +50,16 @@
HOME_URL="https://opensuse.org/";
ID_LIKE="suse"
+== openSUSE Kubic ==
+
+NAME="openSUSE-Kubic"
+VERSION="1.0"
+VERSION_ID="1.0"
+PRETTY_NAME="openSUSE Kubic 1.0"
+ID="opensuse-kubic"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:opensuse-kubic:1.0"
+
== sles12 ==
NAME="SLES"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.307/lib/ReadConfig.pm
new/installation-images-14.312/lib/ReadConfig.pm
--- old/installation-images-14.307/lib/ReadConfig.pm 2017-04-05
11:01:13.000000000 +0200
+++ new/installation-images-14.312/lib/ReadConfig.pm 2017-05-05
15:20:12.000000000 +0200
@@ -890,11 +890,11 @@
# get dist tag for driver updates
my $dist = "\L$config{NAME}";
- $dist =~ s/^opensuse\s*//;
+ $dist =~ s/^opensuse[\-\s]*//;
# 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|leap|sles|sled)$/;
+ $dist = "" if $dist !~ /^(casp|caasp|kubic|leap|sles|sled)$/;
my $is_tw = $config{VERSION} eq 'Tumbleweed' || $config{CPE_NAME} =~
/:tumbleweed:/;
