From 238c567d7ab5093e9eedfb98e91a0c7e0ee74d9d3248d6929e9168c3cf0e68b4 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Wed, 1 Jul 2020 11:57:22 +0000
Subject: [PATCH] Accepting request 818096 from
 home:favogt:branches:Virtualization:Appliances:Images:openSUSE-Tumbleweed

- Drop bootsplash-theme, not used
- Don't touch /etc/default/grub in config.sh, kiwi overwrites it
  anyway
- RPi workarounds are part of the raspberrypi-firmware package now

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

diff --git a/JeOS.kiwi b/JeOS.kiwi
index c21db78..24bb96b 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -18,7 +18,6 @@
     <preferences profiles="kvm-and-xen">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
@@ -53,7 +52,6 @@
     <preferences profiles="VMware">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
@@ -89,7 +87,6 @@
     <preferences profiles="OpenStack-Cloud">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
@@ -110,7 +107,6 @@
     <preferences profiles="MS-HyperV">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
@@ -146,7 +142,6 @@
     <preferences profiles="RaspberryPi">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
diff --git a/config.sh b/config.sh
index 8da887d..3c45f87 100644
--- a/config.sh
+++ b/config.sh
@@ -85,10 +85,6 @@ if [ -x /usr/sbin/firewalld ]; then
         systemctl enable firewalld.service
 fi
 
-# Set GRUB2 to boot graphically (bsc#1097428)
-sed -Ei"" "s/#?GRUB_TERMINAL=.+$/GRUB_TERMINAL=gfxterm/g" /etc/default/grub
-sed -Ei"" "s/#?GRUB_GFXMODE=.+$/GRUB_GFXMODE=auto/g" /etc/default/grub
-
 #======================================
 # Add repos from control.xml
 #--------------------------------------
@@ -134,22 +130,8 @@ sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g' /etc/zypp
 # Configure Raspberry Pi specifics
 #--------------------------------------
 if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then
-        # Also show WLAN interfaces in /etc/issue
+        # Also show WLAN interfaces in /etc/issue. Remove once https://github.com/thkukuk/issue-generator/pull/4 accepted
         baseUpdateSysConfig /etc/sysconfig/issue-generator NETWORK_INTERFACE_REGEX '^[bew]'
-
-	# Add necessary kernel modules to initrd (will disappear with bsc#1084272)
-	echo 'add_drivers+=" bcm2835_dma dwc2 "' > /etc/dracut.conf.d/raspberrypi_modules.conf
-
-	# Work around network issues
-  	cat > /etc/modprobe.d/50-rpi3.conf <<-EOF
-		# Prevent too many page allocations (bsc#1012449)
-		options smsc95xx turbo_mode=N
-	EOF
-
-	cat > /usr/lib/sysctl.d/50-rpi3.conf <<-EOF
-		# Avoid running out of DMA pages for smsc95xx (bsc#1012449)
-		vm.min_free_kbytes = 2048
-	EOF
 fi
 
 # Not compatible with set -e
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 8f0ab07..7854f56 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jun 30 13:37:54 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Drop bootsplash-theme, not used
+- Don't touch /etc/default/grub in config.sh, kiwi overwrites it
+  anyway
+- RPi workarounds are part of the raspberrypi-firmware package now
+
 -------------------------------------------------------------------
 Mon May 18 08:16:29 UTC 2020 - Fabian Vogt <fvogt@suse.com>