From c997b4f0cd20668a92c9336528b9da2bca404c03eebbe97d61ccd5a1564b292e Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 7 Feb 2025 14:57:01 +0000
Subject: [PATCH] - list-x11: No longer ignore bash-completion

- Fix dropping the mellanox kernel drivers on non-usrmerged Leap 15.x
- list-x11: Ignore zypper-lifecycle-plugin

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=201
---
 config.sh                  |  2 +-
 list-x11.sh                | 14 ++------------
 livecd-leap-x11.kiwi       | 24 ++----------------------
 livecd-openSUSE.changes    | 11 +++++++++++
 livecd-tumbleweed-x11.kiwi | 24 ++----------------------
 5 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/config.sh b/config.sh
index ad38332..779d266 100644
--- a/config.sh
+++ b/config.sh
@@ -139,7 +139,7 @@ fi
 find /lib/firmware/nvidia -name gsp | xargs -r rm -rf 
 
 # Remove the mellanox kernel drivers (firmware is removed too)
-rm -rf /usr/lib*/modules/*/kernel/drivers/net/ethernet/mellanox
+rm -rf /lib*/modules/*/kernel/drivers/net/ethernet/mellanox
 
 # The gems are unpackaged already, no need to store them twice
 rm -rf /usr/lib*/ruby/gems/*/cache/
diff --git a/list-x11.sh b/list-x11.sh
index 8702f58..ac84f3a 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -41,6 +41,8 @@ buildignore yast2-control-center
 buildignore yast2-control-center-qt
 # Note: OBS doesn't understand this, but kiwi/zypper do.
 buildignore libyui*
+# No ruby on Leap
+buildignore zypper-lifecycle-plugin
 
 buildignore Mesa-libva
 
@@ -98,18 +100,6 @@ buildignore libqt5-qttranslations
 buildignore plymouth
 buildignore 7zip
 
-buildignore bash-completion
-buildignore ethtool-bash-completion
-buildignore iproute2-bash-completion
-buildignore cpupower-bash-completion
-buildignore nvme-cli-bash-completion
-buildignore btrfsprogs-bash-completion
-buildignore firewalld-bash-completion
-buildignore kmod-bash-completion
-buildignore pulseaudio-bash-completion
-buildignore udisks2-bash-completion
-buildignore lightdm-bash-completion
-
 # On Leap it's a hard dep of dhcp-client, needed by NM.
 # On TW, NM uses the builtin DHCP client instead.
 if [ "$distro" = "tumbleweed" ]; then
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index aeb36bd..1eddd6d 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -502,6 +502,8 @@
     <ignore name="yast2-control-center-qt"/>
     <!-- OBS-IgnorePackage: libyui* -->
     <ignore name="libyui*"/>
+    <!-- OBS-IgnorePackage: zypper-lifecycle-plugin -->
+    <ignore name="zypper-lifecycle-plugin"/>
     <!-- OBS-IgnorePackage: Mesa-libva -->
     <ignore name="Mesa-libva"/>
     <!-- OBS-IgnorePackage: python-base -->
@@ -596,28 +598,6 @@
     <ignore name="plymouth"/>
     <!-- OBS-IgnorePackage: 7zip -->
     <ignore name="7zip"/>
-    <!-- OBS-IgnorePackage: bash-completion -->
-    <ignore name="bash-completion"/>
-    <!-- OBS-IgnorePackage: ethtool-bash-completion -->
-    <ignore name="ethtool-bash-completion"/>
-    <!-- OBS-IgnorePackage: iproute2-bash-completion -->
-    <ignore name="iproute2-bash-completion"/>
-    <!-- OBS-IgnorePackage: cpupower-bash-completion -->
-    <ignore name="cpupower-bash-completion"/>
-    <!-- OBS-IgnorePackage: nvme-cli-bash-completion -->
-    <ignore name="nvme-cli-bash-completion"/>
-    <!-- OBS-IgnorePackage: btrfsprogs-bash-completion -->
-    <ignore name="btrfsprogs-bash-completion"/>
-    <!-- OBS-IgnorePackage: firewalld-bash-completion -->
-    <ignore name="firewalld-bash-completion"/>
-    <!-- OBS-IgnorePackage: kmod-bash-completion -->
-    <ignore name="kmod-bash-completion"/>
-    <!-- OBS-IgnorePackage: pulseaudio-bash-completion -->
-    <ignore name="pulseaudio-bash-completion"/>
-    <!-- OBS-IgnorePackage: udisks2-bash-completion -->
-    <ignore name="udisks2-bash-completion"/>
-    <!-- OBS-IgnorePackage: lightdm-bash-completion -->
-    <ignore name="lightdm-bash-completion"/>
     <!-- OBS-IgnorePackage: tumbler -->
     <ignore name="tumbler"/>
     <!-- OBS-IgnorePackage: ristretto -->
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 81f90a0..ac4170d 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb  7 14:34:06 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- list-x11: No longer ignore bash-completion
+
+-------------------------------------------------------------------
+Fri Feb  7 14:08:03 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Fix dropping the mellanox kernel drivers on non-usrmerged Leap 15.x
+- list-x11: Ignore zypper-lifecycle-plugin
+
 -------------------------------------------------------------------
 Thu Jan 23 09:49:18 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 8a4bf35..c2e30e5 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -502,6 +502,8 @@
     <ignore name="yast2-control-center-qt"/>
     <!-- OBS-IgnorePackage: libyui* -->
     <ignore name="libyui*"/>
+    <!-- OBS-IgnorePackage: zypper-lifecycle-plugin -->
+    <ignore name="zypper-lifecycle-plugin"/>
     <!-- OBS-IgnorePackage: Mesa-libva -->
     <ignore name="Mesa-libva"/>
     <!-- OBS-IgnorePackage: python-base -->
@@ -596,28 +598,6 @@
     <ignore name="plymouth"/>
     <!-- OBS-IgnorePackage: 7zip -->
     <ignore name="7zip"/>
-    <!-- OBS-IgnorePackage: bash-completion -->
-    <ignore name="bash-completion"/>
-    <!-- OBS-IgnorePackage: ethtool-bash-completion -->
-    <ignore name="ethtool-bash-completion"/>
-    <!-- OBS-IgnorePackage: iproute2-bash-completion -->
-    <ignore name="iproute2-bash-completion"/>
-    <!-- OBS-IgnorePackage: cpupower-bash-completion -->
-    <ignore name="cpupower-bash-completion"/>
-    <!-- OBS-IgnorePackage: nvme-cli-bash-completion -->
-    <ignore name="nvme-cli-bash-completion"/>
-    <!-- OBS-IgnorePackage: btrfsprogs-bash-completion -->
-    <ignore name="btrfsprogs-bash-completion"/>
-    <!-- OBS-IgnorePackage: firewalld-bash-completion -->
-    <ignore name="firewalld-bash-completion"/>
-    <!-- OBS-IgnorePackage: kmod-bash-completion -->
-    <ignore name="kmod-bash-completion"/>
-    <!-- OBS-IgnorePackage: pulseaudio-bash-completion -->
-    <ignore name="pulseaudio-bash-completion"/>
-    <!-- OBS-IgnorePackage: udisks2-bash-completion -->
-    <ignore name="udisks2-bash-completion"/>
-    <!-- OBS-IgnorePackage: lightdm-bash-completion -->
-    <ignore name="lightdm-bash-completion"/>
     <!-- OBS-IgnorePackage: bind-utils -->
     <ignore name="bind-utils"/>
     <!-- OBS-IgnorePackage: tumbler -->