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] 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