From 2a0b91a94b36f2e9be8ba74bb5cfdb515814861da259b6450cb940a4e44da14d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sun, 12 Jan 2020 21:05:25 +0000
Subject: [PATCH] - Drop LO now also from the GNOME Live CD: no more space  
 (overshot by 30MB).

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=89
---
 list-common.sh               | 2 +-
 list-gnome.sh                | 5 +++--
 livecd-leap-gnome.kiwi       | 5 +++--
 livecd-leap-kde.kiwi         | 2 +-
 livecd-leap-x11.kiwi         | 2 +-
 livecd-openSUSE.changes      | 7 +++----
 livecd-tumbleweed-gnome.kiwi | 5 +++--
 livecd-tumbleweed-kde.kiwi   | 2 +-
 livecd-tumbleweed-x11.kiwi   | 2 +-
 livecd-tumbleweed-xfce.kiwi  | 2 +-
 10 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/list-common.sh b/list-common.sh
index 09be277..1043d37 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -192,7 +192,7 @@ installPattern yast2_basis
 
 # This was previously required by rest_cd_core
 install kernel-default
-install kernel-firmware-all
+install kernel-firmware
 install patterns-base-enhanced_base
 installPattern enhanced_base
 install patterns-base-x11
diff --git a/list-gnome.sh b/list-gnome.sh
index a7cb150..d06021f 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -24,8 +24,9 @@ buildignore noto-sans-jp-regular-fonts
 buildignore noto-sans-kr-bold-fonts
 buildignore noto-sans-kr-regular-fonts
 
-# Expected by openQA
-install libreoffice-writer
+# Expected by openQA - But no more space on the CD
+# install libreoffice-writer
+buildignore libreoffice
 
 # Packages for the installer
 source "$PWD/list-installer.sh"
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 92a40eb..69ed768 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -313,7 +313,7 @@
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
-    <package name="kernel-firmware-all"/>
+    <package name="kernel-firmware"/>
     <package name="patterns-base-enhanced_base"/>
     <namedCollection name="enhanced_base"/>
     <package name="patterns-base-x11"/>
@@ -451,7 +451,8 @@
     <ignore name="noto-sans-kr-bold-fonts"/>
     <package name="aaa_base" replaces="noto-sans-kr-regular-fonts"/>
     <ignore name="noto-sans-kr-regular-fonts"/>
-    <package name="libreoffice-writer"/>
+    <package name="aaa_base" replaces="libreoffice"/>
+    <ignore name="libreoffice"/>
     <package name="live-net-installer"/>
     <package name="skelcd-openSUSE"/>
     <package name="setxkbmap"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index fae3ee0..ac98985 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -313,7 +313,7 @@
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
-    <package name="kernel-firmware-all"/>
+    <package name="kernel-firmware"/>
     <package name="patterns-base-enhanced_base"/>
     <namedCollection name="enhanced_base"/>
     <package name="patterns-base-x11"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index f46a7cc..7cc6e1b 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -313,7 +313,7 @@
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
-    <package name="kernel-firmware-all"/>
+    <package name="kernel-firmware"/>
     <package name="patterns-base-enhanced_base"/>
     <namedCollection name="enhanced_base"/>
     <package name="patterns-base-x11"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index f6d51bb..c9f5b59 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,9 +1,8 @@
 -------------------------------------------------------------------
-Sun Jan 12 20:25:18 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
+Sun Jan 12 21:02:45 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
 
-- Use kernel-firmware-all (metapackage, pullin in all compressed
-  kernel modules) instead of kernel-firmware (all uncompressed
-  kernel modules).
+- Drop LO now also from the GNOME Live CD: no more space
+  (overshot by 30MB).
 
 -------------------------------------------------------------------
 Sun Jan 12 19:35:13 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 2894006..9f9b130 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -313,7 +313,7 @@
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
-    <package name="kernel-firmware-all"/>
+    <package name="kernel-firmware"/>
     <package name="patterns-base-enhanced_base"/>
     <namedCollection name="enhanced_base"/>
     <package name="patterns-base-x11"/>
@@ -451,7 +451,8 @@
     <ignore name="noto-sans-kr-bold-fonts"/>
     <package name="aaa_base" replaces="noto-sans-kr-regular-fonts"/>
     <ignore name="noto-sans-kr-regular-fonts"/>
-    <package name="libreoffice-writer"/>
+    <package name="aaa_base" replaces="libreoffice"/>
+    <ignore name="libreoffice"/>
     <package name="live-net-installer"/>
     <package name="skelcd-openSUSE"/>
     <package name="setxkbmap"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 2ef0e34..4c80db3 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -313,7 +313,7 @@
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
-    <package name="kernel-firmware-all"/>
+    <package name="kernel-firmware"/>
     <package name="patterns-base-enhanced_base"/>
     <namedCollection name="enhanced_base"/>
     <package name="patterns-base-x11"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index dc2c9cf..edc6236 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -313,7 +313,7 @@
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
-    <package name="kernel-firmware-all"/>
+    <package name="kernel-firmware"/>
     <package name="patterns-base-enhanced_base"/>
     <namedCollection name="enhanced_base"/>
     <package name="patterns-base-x11"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index ab52f89..0d2f4fc 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -313,7 +313,7 @@
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
-    <package name="kernel-firmware-all"/>
+    <package name="kernel-firmware"/>
     <package name="patterns-base-enhanced_base"/>
     <namedCollection name="enhanced_base"/>
     <package name="patterns-base-x11"/>