From 148d31edfde55e2cd9ad9bb1176c5361a618ad2168ba3d34311ff0e9a92438bd Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 13 May 2024 09:28:53 +0000 Subject: [PATCH] Accepting request 1173615 from home:favogt:branches:openSUSE:Factory:Live - Ignore pam_kwallet6 (boo#1224153) - Use %fdupes in config.sh to fix build on Leap OBS-URL: https://build.opensuse.org/request/show/1173615 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=183 --- config.sh | 7 ++-- list-common.sh | 2 +- list-x11.sh | 3 +- livecd-leap-gnome.kiwi | 3 +- livecd-leap-kde.kiwi | 3 +- livecd-leap-x11.kiwi | 67 +++++++++++++++++++++++++++++++++--- livecd-leap-xfce.kiwi | 3 +- livecd-openSUSE.changes | 23 +++++++++++++ livecd-tumbleweed-gnome.kiwi | 3 +- livecd-tumbleweed-kde.kiwi | 3 +- livecd-tumbleweed-x11.kiwi | 7 ++-- livecd-tumbleweed-xfce.kiwi | 3 +- 12 files changed, 107 insertions(+), 20 deletions(-) diff --git a/config.sh b/config.sh index 71e405c..0130dc7 100644 --- a/config.sh +++ b/config.sh @@ -47,7 +47,8 @@ if rpm -q libQt6WebEngineCore6; then rpm -e --nodeps libQt6WebEngineCore6 fi -/usr/lib/rpm/fdupes_wrapper /usr/share/licenses +# Reuse what the macro does +rpm --eval "%fdupes /usr/share/licenses" | sh #-------------------------------------- # enable and disable services @@ -116,8 +117,8 @@ EULA_DIR=/etc/YaST2/licenses/base (cd "${EULA_DIR}"; tar -cvzf /license.tar.gz *) # Remove some large locales to save space -rm -rf /usr/{lib,share}/locale/{ca,cs,da,ja,fi,hu,id,ko,nl,pl,tr,ru,sk,sr,sv,uk,vi,cmn_TW,zh}* -rm -rf /usr/share/qt5/translations/*_{ca,cs,da,ja,fi,hu,id,ko,nl,pl,tr,ru,sk,sr,sv,uk,vi,cmn_TW,zh}* +rm -rf /usr/{lib,share}/locale/{ca,cs,da,es,it,ja,fi,hu,id,ko,nl,pl,pt_BR,tr,ro,ru,sk,sr,sv,uk,vi,cmn_TW,zh}* +rm -rf /usr/share/qt5/translations/*_{ca,cs,da,es,it,ja,fi,hu,id,ko,nl,pl,pr_BR,tr,ro,ru,sk,sr,sv,uk,vi,cmn_TW,zh}* zypper --non-interactive rm yast2-trans-{uk,sv,ru,ja,da,cs,sr,vi} || : # Some packages really exaggerate here diff --git a/list-common.sh b/list-common.sh index e6a536a..e9aab8c 100644 --- a/list-common.sh +++ b/list-common.sh @@ -118,6 +118,7 @@ buildignore usbmuxd # http://bugzilla.opensuse.org/show_bug.cgi?id=1209177 buildignore gnome-keyring-pam buildignore pam_kwallet +buildignore pam_kwallet6 buildignore apparmor-docs buildignore mutt-doc @@ -236,7 +237,6 @@ install dmraid install dosfstools install e2fsprogs install exfatprogs -install jfsutils install mdadm install multipath-tools install ntfs-3g diff --git a/list-x11.sh b/list-x11.sh index 2247c6c..7ed86be 100644 --- a/list-x11.sh +++ b/list-x11.sh @@ -1,5 +1,6 @@ buildignore NetworkManager-lang buildignore NetworkManager-applet-lang +buildignore NetworkManager-pptp buildignore PackageKit buildignore samba-libs buildignore release-notes-openSUSE @@ -148,7 +149,6 @@ install hexchat install leafpad install lightdm install lightdm-gtk-greeter -install photorec install thunar install thunar-volman install xfce4-appfinder @@ -166,7 +166,6 @@ install dbus-1-x11 install desktop-file-utils install libgnomesu install libxfce4ui-tools -install pinentry-gtk2 install shared-mime-info install xdg-user-dirs-gtk install xdg-utils diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 00a2f10..1dd646c 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -239,6 +239,8 @@ + + @@ -359,7 +361,6 @@ - diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 24d38a2..425f874 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -239,6 +239,8 @@ + + @@ -359,7 +361,6 @@ - diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 79ca182..bd3d581 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -239,6 +239,8 @@ + + @@ -359,7 +361,6 @@ - @@ -425,6 +426,8 @@ + + @@ -535,14 +538,48 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -559,6 +596,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -585,7 +644,6 @@ - @@ -601,7 +659,6 @@ - diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index 55b7f7e..d122579 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -239,6 +239,8 @@ + + @@ -359,7 +361,6 @@ - diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index e7e9dfe..54e6a08 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon May 13 09:24:27 UTC 2024 - Fabian Vogt + +- Ignore pam_kwallet6 (boo#1224153) + +------------------------------------------------------------------- +Wed May 8 14:14:09 UTC 2024 - Dominique Leuenberger + +- Drop jfsutils from all lives: this is not one of our supported + file systems. USers of installed systems are free to use the + tools. + +------------------------------------------------------------------- +Wed May 8 12:34:59 UTC 2024 - Dominique Leuenberger + +- Block NetworkManager-pptp from the x11 live: to recover the + machine, pptp is unlikely to be needed. + ------------------------------------------------------------------- Tue Apr 23 11:14:27 UTC 2024 - Ana Guerrero @@ -24,6 +42,11 @@ Mon Apr 22 12:41:09 UTC 2024 - Ana Guerrero - Fix tumbleweed live image, try to decrease size following the new branding packages. Remove a few lang packages from xfce. +------------------------------------------------------------------- +Mon Mar 25 14:48:59 UTC 2024 - Fabian Vogt + +- Use %fdupes in config.sh to fix build on Leap + ------------------------------------------------------------------- Tue Mar 19 16:18:33 UTC 2024 - Dominique Leuenberger diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index eb76159..ced24b6 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -239,6 +239,8 @@ + + @@ -359,7 +361,6 @@ - diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 457f4eb..c7d6a89 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -239,6 +239,8 @@ + + @@ -359,7 +361,6 @@ - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index e7c2e83..192a5cc 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -239,6 +239,8 @@ + + @@ -359,7 +361,6 @@ - @@ -425,6 +426,8 @@ + + @@ -643,7 +646,6 @@ - @@ -659,7 +661,6 @@ - diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 7f16eed..e11338b 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -239,6 +239,8 @@ + + @@ -359,7 +361,6 @@ -