From 4e11a148a2669f0b4b667d1345950abe264c16b15bdfabbd184b501676e98328 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Wed, 20 Nov 2019 14:48:07 +0000
Subject: [PATCH 1/4] - Add systemd-logger and dosfstools - Drop salt-minion

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=7
---
 JeOS.kiwi                   | 5 ++---
 kiwi-templates-JeOS.changes | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/JeOS.kiwi b/JeOS.kiwi
index e4131da..533f003 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -343,14 +343,13 @@
         <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>
 
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 7293551..36bbf46 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 20 12:59:31 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Add systemd-logger and dosfstools
+- Drop salt-minion
+
 -------------------------------------------------------------------
 Fri Oct 25 09:16:36 UTC 2019 - Matthias Brugger <mbrugger@suse.com>
 

From efd41e64c17eac88560511676befa57bd61472ff50681d29113384e3f1d4b0fd Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 26 Nov 2019 13:12:05 +0000
Subject: [PATCH 2/4] - Don't enable chrony-wait even on RPi, it might delay
 booting   unacceptably long

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=8
---
 config.sh                   | 8 --------
 kiwi-templates-JeOS.changes | 6 ++++++
 kiwi-templates-JeOS.spec    | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/config.sh b/config.sh
index c0cef50..d30a491 100644
--- a/config.sh
+++ b/config.sh
@@ -93,14 +93,6 @@ else
 
         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
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 36bbf46..4f48c8a 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 26 13:11:12 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Don't enable chrony-wait even on RPi, it might delay booting
+  unacceptably long
+
 -------------------------------------------------------------------
 Wed Nov 20 12:59:31 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/kiwi-templates-JeOS.spec b/kiwi-templates-JeOS.spec
index 49ed476..e3ba2b0 100644
--- a/kiwi-templates-JeOS.spec
+++ b/kiwi-templates-JeOS.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 

From 1fc4f88abf0bedb7f1a140f9829f0d5dfc9589312f1e802811f0b6ecb63cf018 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 26 Nov 2019 13:14:07 +0000
Subject: [PATCH 3/4] Fixup old spec-cleaner mess

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=9
---
 kiwi-templates-JeOS.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwi-templates-JeOS.spec b/kiwi-templates-JeOS.spec
index e3ba2b0..49ed476 100644
--- a/kiwi-templates-JeOS.spec
+++ b/kiwi-templates-JeOS.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 

From b9ecde1f2c495c32cef90925eecc88319c06399fd4a3d02e8e429436e3153c8c Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 26 Nov 2019 15:31:37 +0000
Subject: [PATCH 4/4] Accepting request 750292 from home:mbrugger:branches:RPi4

- Enable one image for RPi3/4
  * delete obsolete RPi4 target

OBS-URL: https://build.opensuse.org/request/show/750292
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=10
---
 JeOS.kiwi                   | 57 ++-----------------------------------
 _multibuild                 |  1 -
 kiwi-templates-JeOS.changes |  6 ++++
 kiwi-templates-JeOS.spec    |  4 +--
 4 files changed, 11 insertions(+), 57 deletions(-)

diff --git a/JeOS.kiwi b/JeOS.kiwi
index 533f003..0dd6e6f 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -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>
@@ -354,7 +308,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,RaspberryPi4">
+    <packages type="image" profiles="kvm-and-xen,XEN,VMware,MS-HyperV,RaspberryPi">
         <!-- Only for btrfs -->
         <package name="btrfsprogs"/>
         <package name="btrfsmaintenance"/>
@@ -392,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"/>
@@ -402,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
diff --git a/_multibuild b/_multibuild
index a13c77d..e8f56d8 100644
--- a/_multibuild
+++ b/_multibuild
@@ -5,5 +5,4 @@
   <flavor>MS-HyperV</flavor>
   <flavor>OpenStack-Cloud</flavor>
   <flavor>RaspberryPi</flavor>
-  <flavor>RaspberryPi4</flavor>
 </multibuild>
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 4f48c8a..d32888a 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -4,6 +4,12 @@ Tue Nov 26 13:11:12 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 - Don't enable chrony-wait even on RPi, it might delay booting
   unacceptably long
 
+-------------------------------------------------------------------
+Wed Nov 20 14:36:54 UTC 2019 - Matthias Brugger <mbrugger@suse.com>
+
+- Enable one image for RPi3/4
+  * delete obsolete RPi4 target
+
 -------------------------------------------------------------------
 Wed Nov 20 12:59:31 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/kiwi-templates-JeOS.spec b/kiwi-templates-JeOS.spec
index 49ed476..d53290d 100644
--- a/kiwi-templates-JeOS.spec
+++ b/kiwi-templates-JeOS.spec
@@ -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 @@ BuildArch:      noarch
 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