Hello community,
here is the log from the commit of package kiwi-templates-JeOS for
openSUSE:Factory checked in at 2019-12-02 11:30:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-templates-JeOS (Old)
and /work/SRC/openSUSE:Factory/.kiwi-templates-JeOS.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-JeOS"
Mon Dec 2 11:30:31 2019 rev:4 rq:751065 version:84.87
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi-templates-JeOS/kiwi-templates-JeOS.changes
2019-11-03 11:49:50.162793127 +0100
+++
/work/SRC/openSUSE:Factory/.kiwi-templates-JeOS.new.4691/kiwi-templates-JeOS.changes
2019-12-02 11:34:42.786464091 +0100
@@ -1,0 +2,18 @@
+Tue Nov 26 13:11:12 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Don't enable chrony-wait even on RPi, it might delay booting
+ unacceptably long
+
+-------------------------------------------------------------------
+Wed Nov 20 14:36:54 UTC 2019 - Matthias Brugger <[email protected]>
+
+- Enable one image for RPi3/4
+ * delete obsolete RPi4 target
+
+-------------------------------------------------------------------
+Wed Nov 20 12:59:31 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Add systemd-logger and dosfstools
+- Drop salt-minion
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ JeOS.kiwi ++++++
--- /var/tmp/diff_new_pack.LnIvx6/_old 2019-12-02 11:34:43.994463492 +0100
+++ /var/tmp/diff_new_pack.LnIvx6/_new 2019-12-02 11:34:43.998463490 +0100
@@ -15,7 +15,6 @@
<profile name="MS-HyperV" description="JeOS for Hyper-V"
arch="x86_64"/>
<profile name="OpenStack-Cloud" description="JeOS for OpenStack Cloud"
arch="x86_64"/>
<profile name="RaspberryPi" description="JeOS for the Raspberry Pi"
arch="aarch64"/>
- <profile name="RaspberryPi4" description="JeOS for the Raspberry Pi4"
arch="aarch64"/>
</profiles>
<preferences profiles="kvm-and-xen">
<version>15.1.0</version>
@@ -262,51 +261,6 @@
</type>
</preferences>
- <preferences profiles="RaspberryPi4">
- <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="oem"
- initrd_system="dracut"
- filesystem="btrfs"
- fsmountoptions="noatime,compress=lzo"
- bootloader="grub2"
- firmware="efi"
- kernelcmdline="plymouth.enable=0 cma=64M console=ttyS0,115200
modprobe.blacklist=vc4"
- bootpartition="false"
- devicepersistency="by-uuid"
- btrfs_quota_groups="true"
- btrfs_root_is_snapshot="true"
- efipartsize="16"
- editbootinstall="editbootinstall_rpi.sh"
- >
- <systemdisk>
- <volume name="home"/>
- <volume name="root"/>
- <volume name="tmp"/>
- <volume name="opt"/>
- <volume name="srv"/>
- <volume name="boot/grub2/arm64-efi"
mountpoint="boot/grub2/arm64-efi"/>
- <volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
- </systemdisk>
- <oemconfig>
- <oem-swap>true</oem-swap>
- <oem-swapsize>1000</oem-swapsize>
- <oem-skip-verify>true</oem-skip-verify>
- </oemconfig>
- </type>
- </preferences>
-
<repository type="rpm-md" >
<source path='obsrepositories:/'/>
</repository>
@@ -343,19 +297,18 @@
<package name="openSUSE-build-key"/>
<package name="systemd"/>
<package name="systemd-sysvinit"/>
+ <package name="systemd-logger"/> <!-- To have a persistent journal -->
<package name="timezone"/>
<package name="wicked"/>
<package name="iproute2"/>
<package name="openssh"/>
<package name="rsync"/>
- <package name="salt-minion"/>
-<!-- Do we need this for Leap?
- <package name="jeos-licenses"/> -->
+ <package name="dosfstools"/> <!-- For fscking /boot/efi -->
<package name="live-add-yast-repos"/>
</packages>
<!-- Not needed in OpenStack as it uses XFS and cloud-init -->
- <packages type="image"
profiles="kvm-and-xen,XEN,VMware,MS-HyperV,RaspberryPi,RaspberryPi4">
+ <packages type="image"
profiles="kvm-and-xen,XEN,VMware,MS-HyperV,RaspberryPi">
<!-- Only for btrfs -->
<package name="btrfsprogs"/>
<package name="btrfsmaintenance"/>
@@ -393,7 +346,7 @@
<package name="kernel-default-base"/>
<!--<package name="python-azure-agent"/> disabled until bsc#1061584 is
fixed -->
</packages>
- <packages type="image" profiles="RaspberryPi,RaspberryPi4">
+ <packages type="image" profiles="RaspberryPi">
<package name="raspberrypi-firmware" arch="aarch64"/>
<package name="raspberrypi-firmware-config" arch="aarch64"/>
<package name="raspberrypi-firmware-dt" arch="aarch64"/>
@@ -403,12 +356,7 @@
<package name="jeos-firstboot-rpiwifi"/>
<package name="bcm43xx-firmware"/>
<package name="kernel-firmware"/><!-- Fix choice between
kernel-firmware and kernel-firmware-all -->
- </packages>
- <packages type="image" profiles="RaspberryPi">
- <package name="u-boot-rpi3" arch="aarch64"/>
- </packages>
- <packages type="image" profiles="RaspberryPi4">
- <package name="u-boot-rpi4" arch="aarch64"/>
+ <package name="u-boot-rpiarm64" arch="aarch64"/>
</packages>
<!-- TW does not have those release packages
++++++ kiwi-templates-JeOS.spec ++++++
--- /var/tmp/diff_new_pack.LnIvx6/_old 2019-12-02 11:34:44.022463478 +0100
+++ /var/tmp/diff_new_pack.LnIvx6/_new 2019-12-02 11:34:44.022463478 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-templates-JeOS
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# 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 @@
Summary: KIWI - openSUSE Tumbleweed JeOS image templates
License: MIT
Group: System/Management
-Url: https://www.opensuse.org/
+URL: https://www.opensuse.org/
Source01: config.sh
Source02: JeOS.kiwi
Source03: editbootinstall_rpi.sh
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.LnIvx6/_old 2019-12-02 11:34:44.062463458 +0100
+++ /var/tmp/diff_new_pack.LnIvx6/_new 2019-12-02 11:34:44.062463458 +0100
@@ -5,5 +5,4 @@
<flavor>MS-HyperV</flavor>
<flavor>OpenStack-Cloud</flavor>
<flavor>RaspberryPi</flavor>
- <flavor>RaspberryPi4</flavor>
</multibuild>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.LnIvx6/_old 2019-12-02 11:34:44.074463453 +0100
+++ /var/tmp/diff_new_pack.LnIvx6/_new 2019-12-02 11:34:44.078463451 +0100
@@ -93,14 +93,6 @@
systemctl mask systemd-firstboot.service
systemctl enable jeos-firstboot.service
-
- # Only RPi has no HW RTC, so avoid bsc#1146374 for other platforms
- # Do not enable chrony on RPi4 for now, as it waits for
- # ever to get a not-yet-existing network connection.
- if [[ "$kiwi_profiles" == *"RaspberryPi" ]]; then
- # Make sure jeos-firstboot can rely on synced time
(bsc#1129730)
- systemctl enable chrony-wait.service
- fi
fi
# Enable firewalld if installed
