Hello community,
here is the log from the commit of package kiwi-templates-JeOS for
openSUSE:Factory checked in at 2020-03-16 10:16:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-templates-JeOS (Old)
and /work/SRC/openSUSE:Factory/.kiwi-templates-JeOS.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-JeOS"
Mon Mar 16 10:16:05 2020 rev:10 rq:784614 version:84.87
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi-templates-JeOS/kiwi-templates-JeOS.changes
2020-03-08 22:23:59.764072229 +0100
+++
/work/SRC/openSUSE:Factory/.kiwi-templates-JeOS.new.3160/kiwi-templates-JeOS.changes
2020-03-16 10:16:39.683546253 +0100
@@ -1,0 +2,9 @@
+Thu Mar 12 14:14:03 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Drop XEN flavor, identical to kvm-and-xen meanwhile (boo#1166474)
+- Remove obsolete and redundant parts from config.sh
+- Remove indefinitely commented out sections in JeOS.kiwi
+- Remove invalid vga="normal"
+- Add condition to make config.sh suitable for both openSUSE and SLE
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ JeOS.kiwi ++++++
--- /var/tmp/diff_new_pack.pwlL4o/_old 2020-03-16 10:16:41.395546950 +0100
+++ /var/tmp/diff_new_pack.pwlL4o/_new 2020-03-16 10:16:41.415546958 +0100
@@ -10,7 +10,6 @@
</description>
<profiles>
<profile name="kvm-and-xen" description="JeOS for KVM and HVM Xen"
arch="x86_64"/>
- <profile name="XEN" description="JeOS for PV Xen" arch="x86_64"/>
<profile name="VMware" description="JeOS for VMware" arch="x86_64"/>
<profile name="MS-HyperV" description="JeOS for Hyper-V"
arch="x86_64"/>
<profile name="OpenStack-Cloud" description="JeOS for OpenStack Cloud"
arch="x86_64"/>
@@ -21,12 +20,6 @@
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
- <!-- those settings are applied by suseConfig in config.sh
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- -->
<rpm-excludedocs>true</rpm-excludedocs>
<type
image="vmx"
@@ -57,64 +50,11 @@
</type>
</preferences>
- <preferences profiles="XEN">
- <version>15.1.0</version>
- <packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
- <bootloader-theme>openSUSE</bootloader-theme>
- <!-- those settings are applied by suseConfig in config.sh
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- -->
- <rpm-excludedocs>true</rpm-excludedocs>
- <type
- image="vmx"
- filesystem="btrfs"
- bootprofile="xen"
- firmware="uefi"
- efipartsize="33"
- format="qcow2"
- bootloader="grub2"
- kernelcmdline="quiet plymouth.enable=0 console=tty0"
- bootpartition="false"
- bootkernel="custom"
- devicepersistency="by-uuid"
- btrfs_quota_groups="true"
- btrfs_root_is_snapshot="true"
- >
- <systemdisk>
- <volume name="home"/>
- <volume name="root"/>
- <volume name="tmp"/>
- <volume name="opt"/>
- <volume name="srv"/>
- <volume name="boot/grub2/i386-pc"/>
- <volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
- <volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
- </systemdisk>
- <size unit="G">24</size>
- <machine domain="domU">
- <!-- creation of hvmloader Xen config file is not supported -->
- <!-- thus just provide mandatory setup indicating there is a
disk -->
- <vmdisk id="0"/>
- </machine>
- </type>
- </preferences>
-
<preferences profiles="VMware">
<version>15.1.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
- <!-- those settings are applied by suseConfig in config.sh
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- -->
<rpm-excludedocs>true</rpm-excludedocs>
<type
image="vmx"
@@ -151,18 +91,11 @@
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
- <!-- those settings are applied by suseConfig in config.sh
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- -->
<rpm-excludedocs>true</rpm-excludedocs>
<type
image="vmx"
filesystem="xfs"
format="qcow2"
- vga="normal"
boottimeout="1"
bootloader="grub2"
firmware="uefi"
@@ -179,12 +112,6 @@
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
- <!-- those settings are applied by suseConfig in config.sh
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- -->
<rpm-excludedocs>true</rpm-excludedocs>
<type
image="vmx"
@@ -221,12 +148,6 @@
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
- <!-- those settings are applied by suseConfig in config.sh
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- -->
<rpm-excludedocs>true</rpm-excludedocs>
<type
image="oem"
@@ -300,7 +221,7 @@
</packages>
<!-- Not needed in OpenStack as it uses XFS and cloud-init -->
- <packages type="image"
profiles="kvm-and-xen,XEN,VMware,MS-HyperV,RaspberryPi">
+ <packages type="image" profiles="kvm-and-xen,VMware,MS-HyperV,RaspberryPi">
<!-- Only for btrfs -->
<package name="btrfsprogs"/>
<package name="btrfsmaintenance"/>
@@ -316,10 +237,8 @@
<package name="firewalld"/>
</packages>
- <packages type="image" profiles="kvm-and-xen,XEN">
- <!-- XEN specific packages -->
+ <packages type="image" profiles="kvm-and-xen">
<package name="xen-tools-domU" arch="x86_64"/>
- <package name="grub2-x86_64-xen" arch="x86_64"/>
<package name="xen-libs" arch="x86_64"/>
<package name="kernel-default-base"/>
</packages>
@@ -328,15 +247,14 @@
<package name="kernel-default-base"/>
</packages>
<packages type="image" profiles="OpenStack-Cloud">
- <package name="cloud-init" />
+ <package name="cloud-init"/>
<package name="cloud-init-config-suse" />
- <package name="xfsprogs" />
+ <package name="xfsprogs"/>
<package name="kernel-default-base"/>
</packages>
<packages type="image" profiles="MS-HyperV">
- <package name="hyper-v" arch="x86_64"/>
+ <package name="hyper-v"/>
<package name="kernel-default-base"/>
- <!--<package name="python-azure-agent"/> disabled until bsc#1061584 is
fixed -->
</packages>
<packages type="image" profiles="RaspberryPi">
<package name="raspberrypi-firmware" arch="aarch64"/>
@@ -352,7 +270,7 @@
</packages>
<!-- TW does not have those release packages
- <packages type="image" profiles="kvm-and-xen,XEN">
+ <packages type="image" profiles="kvm-and-xen">
<package name="openSUSE-release-appliance-kvm"/>
</packages>
<packages type="image" profiles="OpenStack-Cloud">
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.pwlL4o/_old 2020-03-16 10:16:41.747547094 +0100
+++ /var/tmp/diff_new_pack.pwlL4o/_new 2020-03-16 10:16:41.767547102 +0100
@@ -1,6 +1,5 @@
<multibuild>
<flavor>kvm-and-xen</flavor>
- <flavor>XEN</flavor>
<flavor>VMware</flavor>
<flavor>MS-HyperV</flavor>
<flavor>OpenStack-Cloud</flavor>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.pwlL4o/_old 2020-03-16 10:16:41.847547134 +0100
+++ /var/tmp/diff_new_pack.pwlL4o/_new 2020-03-16 10:16:41.847547134 +0100
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2015 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -27,8 +27,6 @@
set -euxo pipefail
-mkdir /var/lib/misc/reconfig_system
-
#======================================
# Greeting...
#--------------------------------------
@@ -37,7 +35,8 @@
#======================================
# add missing fonts
#--------------------------------------
-CONSOLE_FONT="eurlatgr.psfu"
+# Systemd controls the console font now
+echo FONT="eurlatgr.psfu" >> /etc/vconsole.conf
#======================================
# prepare for setting root pw, timezone
@@ -50,26 +49,12 @@
/var/lib/dbus/machine-id
#======================================
-# SuSEconfig
-#--------------------------------------
-echo "** Running suseConfig..."
-suseConfig
-
-echo "** Running ldconfig..."
-/sbin/ldconfig
-
-#======================================
-# Setup baseproduct link
+# Specify default systemd target
#--------------------------------------
-suseSetupProduct
+baseSetRunlevel multi-user.target
#======================================
-# Specify default runlevel
-#--------------------------------------
-baseSetRunlevel 3
-
-#======================================
-# Add missing gpg keys to rpm
+# Import trusted rpm keys
#--------------------------------------
suseImportBuildKey
@@ -104,35 +89,13 @@
sed -Ei"" "s/#?GRUB_TERMINAL=.+$/GRUB_TERMINAL=gfxterm/g" /etc/default/grub
sed -Ei"" "s/#?GRUB_GFXMODE=.+$/GRUB_GFXMODE=auto/g" /etc/default/grub
-# Systemd controls the console font now
-echo FONT="$CONSOLE_FONT" >> /etc/vconsole.conf
-
-#======================================
-# SSL Certificates Configuration
-#--------------------------------------
-echo '** Rehashing SSL Certificates...'
-update-ca-certificates
-
-if [ ! -s /var/log/zypper.log ]; then
- > /var/log/zypper.log
-fi
-
-#======================================
-# Import trusted rpm keys
-#--------------------------------------
-for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do
- # importing can fail if it already exists
- rpm --import $i || true
-done
-
#======================================
# Add repos from control.xml
#--------------------------------------
-add-yast-repos
-zypper --non-interactive rm -u live-add-yast-repos
-
-# only for debugging
-#systemctl enable debug-shell.service
+if grep -q opensuse /usr/lib/os-release; then
+ add-yast-repos
+ zypper --non-interactive rm -u live-add-yast-repos
+fi
#=====================================
# Configure snapper
@@ -140,7 +103,7 @@
if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then
echo "creating initial snapper config ..."
# we can't call snapper here as the .snapshots subvolume
- # already exists and snapper create-config doens't like
+ # already exists and snapper create-config doesn't like
# that.
cp /etc/snapper/config-templates/default /etc/snapper/configs/root
# Change configuration to match SLES12-SP1 values
