Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2019-04-25 17:52:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Thu Apr 25 17:52:26 2019 rev:69 rq:697810 version:14.422
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2019-04-08 20:52:01.650501918 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new.5536/installation-images.changes
2019-04-25 17:52:27.597005031 +0200
@@ -0,0 +1,15 @@
+--------------------------------------------------------------------
+Thu Apr 25 09:19:08 UTC 2019 - wfe...@opensuse.org
+
+- merge gh#openSUSE/installation-images#308
+- add /dev/btrfs-control to initrd (bsc#1133368)
+- 14.422
+
+--------------------------------------------------------------------
+Wed Apr 24 13:35:51 UTC 2019 - snw...@suse.de
+
+- merge gh#openSUSE/installation-images#307
+- patch zypp config also for MicroOS (bsc#1132848)
+- adjust branding example
+- 14.421
+
Old:
----
installation-images-14.420.tar.xz
New:
----
installation-images-14.422.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.KXtlYk/_old 2019-04-25 17:52:28.117004757 +0200
+++ /var/tmp/diff_new_pack.KXtlYk/_new 2019-04-25 17:52:28.117004757 +0200
@@ -585,7 +585,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.420
+Version: 14.422
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.420.tar.xz -> installation-images-14.422.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.420/VERSION
new/installation-images-14.422/VERSION
--- old/installation-images-14.420/VERSION 2019-03-28 15:13:23.000000000
+0100
+++ new/installation-images-14.422/VERSION 2019-04-25 11:19:08.000000000
+0200
@@ -1 +1 @@
-14.420
+14.422
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.420/changelog
new/installation-images-14.422/changelog
--- old/installation-images-14.420/changelog 2019-03-28 15:13:23.000000000
+0100
+++ new/installation-images-14.422/changelog 2019-04-25 11:19:08.000000000
+0200
@@ -1,3 +1,12 @@
+2019-04-25: 14.422
+ - merge gh#openSUSE/installation-images#308
+ - add /dev/btrfs-control to initrd (bsc#1133368)
+
+2019-04-24: 14.421
+ - merge gh#openSUSE/installation-images#307
+ - patch zypp config also for MicroOS (bsc#1132848)
+ - adjust branding example
+
2019-03-28: 14.420
- merge gh#openSUSE/installation-images#306
- add more aarch64 modules (bsc#1129815)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.420/data/base/base.file_list
new/installation-images-14.422/data/base/base.file_list
--- old/installation-images-14.420/data/base/base.file_list 2019-03-28
15:13:23.000000000 +0100
+++ new/installation-images-14.422/data/base/base.file_list 2019-04-25
11:19:08.000000000 +0200
@@ -24,6 +24,9 @@
c 660 0 5 /dev/tty9
C 5 1 /dev/console
c 600 0 5 /dev/console
+# btrfs-control is also needed (bsc#1133368)
+C 10 234 /dev/btrfs-control
+c 660 0 0 /dev/btrfs-control
b 7 0 /dev/loop0
c 660 0 6 /dev/loop0
b 7 1 /dev/loop1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.420/data/initrd/initrd.file_list
new/installation-images-14.422/data/initrd/initrd.file_list
--- old/installation-images-14.420/data/initrd/initrd.file_list 2019-03-28
15:13:23.000000000 +0100
+++ new/installation-images-14.422/data/initrd/initrd.file_list 2019-04-25
11:19:08.000000000 +0200
@@ -120,7 +120,7 @@
# add zypp config to initrd to ensure it's writable
libzypp: nodeps
/etc
- if (theme eq 'CAASP') || (theme eq 'Kubic')
+ if patch_zypp_config_theme
# patch /etc/zypp/zypp.conf (fate #321764); sets
# solver.onlyRequires = true, rpm.install.excludedocs = yes, multiversion =
R s/^[#[:space:]]*(solver.onlyRequires)\s+=.*/# minimal CAASP\n$1 = true/
etc/zypp/zypp.conf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.420/doc/branding.md
new/installation-images-14.422/doc/branding.md
--- old/installation-images-14.420/doc/branding.md 2019-03-28
15:13:23.000000000 +0100
+++ new/installation-images-14.422/doc/branding.md 2019-04-25
11:19:08.000000000 +0200
@@ -5,15 +5,16 @@
```sh
[Theme SLES]
-image = 600 # memory limit for loading inst-sys:
600 MB
+image = 600 # memory limit for loading inst-sys:
600 MB
+patch_zypp_config = 0 # whether to adjust zypp.conf for micro-os-like
systems
# 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
+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
```
Then add an appropriate theme section to `installation-images.spec`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.420/etc/config
new/installation-images-14.422/etc/config
--- old/installation-images-14.420/etc/config 2019-03-28 15:13:23.000000000
+0100
+++ new/installation-images-14.422/etc/config 2019-04-25 11:19:08.000000000
+0200
@@ -67,7 +67,8 @@
; Define per-theme related values.
;
-; 'image' ends up as MemLoadImage entry in linuxrc.config.
+; 'image': MemLoadImage entry in linuxrc.config
+; 'patch_zypp_config': whether to adjust zypp.conf for micro-os & co
;
; All other values are intended as suffixes for branding packages. Values
; can be used as <foo_theme> in *.file_list files.
@@ -77,81 +78,89 @@
; You can override settings via env vars of the same name ('foo_theme').
;
[Theme openSUSE]
-image = 350
-release = openSUSE
-skelcd = openSUSE
-skelcd_ctrl = openSUSE
-gfxboot = openSUSE
-grub2 = openSUSE
-plymouth = openSUSE
-systemd = openSUSE
+image = 350
+patch_zypp_config = 0
+release = openSUSE
+skelcd = openSUSE
+skelcd_ctrl = openSUSE
+gfxboot = openSUSE
+grub2 = openSUSE
+plymouth = openSUSE
+systemd = openSUSE
[Theme SLES]
-image = 600
-release = unified-installer
-skelcd = sles
-skelcd_ctrl = leanos
-gfxboot = SLE
-grub2 = SLE
-plymouth = SLE
-systemd = SLE
+image = 600
+patch_zypp_config = 0
+release = unified-installer
+skelcd = sles
+skelcd_ctrl = leanos
+gfxboot = SLE
+grub2 = SLE
+plymouth = SLE
+systemd = SLE
[Theme SLES_SAP]
-image = 600
-release = unified-installer
-skelcd = sles
-skelcd_ctrl = leanos
-gfxboot = SLE
-grub2 = SLE
-plymouth = SLE
-systemd = SLE
+image = 600
+patch_zypp_config = 0
+release = unified-installer
+skelcd = sles
+skelcd_ctrl = leanos
+gfxboot = SLE
+grub2 = SLE
+plymouth = SLE
+systemd = SLE
[Theme SLED]
-image = 600
-release = unified-installer
-skelcd = sled
-skelcd_ctrl = leanos
-gfxboot = SLE
-grub2 = SLE
-plymouth = SLE
-systemd = SLE
+image = 600
+patch_zypp_config = 0
+release = unified-installer
+skelcd = sled
+skelcd_ctrl = leanos
+gfxboot = SLE
+grub2 = SLE
+plymouth = SLE
+systemd = SLE
[Theme CAASP]
-image = 600
-release = caasp
-skelcd = caasp
-skelcd_ctrl = CAASP
-gfxboot = SLE
-grub2 = SLE
-plymouth = SLE
-systemd = CAASP
+image = 600
+patch_zypp_config = 1
+release = caasp
+skelcd = caasp
+skelcd_ctrl = CAASP
+gfxboot = SLE
+grub2 = SLE
+plymouth = SLE
+systemd = CAASP
[Theme Kubic]
-image = 350
-release = openSUSE-MicroOS
-skelcd = openSUSE
-skelcd_ctrl = Kubic
-gfxboot = openSUSE
-grub2 = openSUSE
-plymouth = openSUSE
-systemd = MicroOS
+image = 350
+patch_zypp_config = 1
+release = openSUSE-MicroOS
+skelcd = openSUSE
+skelcd_ctrl = Kubic
+gfxboot = openSUSE
+grub2 = openSUSE
+plymouth = openSUSE
+systemd = MicroOS
[Theme MicroOS]
-image = 350
-release = openSUSE-MicroOS
-skelcd = openSUSE
-skelcd_ctrl = MicroOS
-gfxboot = openSUSE
-grub2 = openSUSE
-plymouth = openSUSE
-systemd = MicroOS
+image = 350
+patch_zypp_config = 1
+release = openSUSE-MicroOS
+skelcd = openSUSE
+skelcd_ctrl = MicroOS
+gfxboot = openSUSE
+grub2 = openSUSE
+plymouth = openSUSE
+systemd = MicroOS
[Theme Zen]
-image = 600
-release = unified-installer
-skelcd = sles
-skelcd_ctrl = leanos
-gfxboot = SLE
-grub2 = SLE
-plymouth = SLE
-systemd = SLE
+image = 600
+patch_zypp_config = 0
+release = unified-installer
+skelcd = sles
+skelcd_ctrl = leanos
+gfxboot = SLE
+grub2 = SLE
+plymouth = SLE
+systemd = SLE
