diff --git a/config.sh b/config.sh index 4de6b28..68786de 100644 --- a/config.sh +++ b/config.sh @@ -78,9 +78,6 @@ if [ "$desktop" = "x11" ]; then # Only used for X11 acceleration on vmwgfx, saves ~47MiB rpm -e --nodeps Mesa-gallium - # Surely that specific font isn't necessary - rpm -e --nodeps google-poppins-fonts - # Generated on boot if missing rm /etc/udev/hwdb.bin fi diff --git a/list-common.sh b/list-common.sh index abee241..68ec905 100644 --- a/list-common.sh +++ b/list-common.sh @@ -166,13 +166,6 @@ buildignore hplip buildignore system-config-printer-applet buildignore udev-configure-printer -# We don't need those -buildignore yast2-samba-client -buildignore yast2-vpn -buildignore yast2-journal -buildignore yast2-auth-client -buildignore yast2-sudo - # systemd-coredump makes no sense on a live image: there are no debuginfo installed buildignore systemd-coredump buildignore systemd-doc @@ -214,10 +207,6 @@ buildignore vim-data buildignore vim install vim-small -# This was previously required by base -install patterns-yast-yast2_basis -installPattern yast2_basis - # This was previously required by rest_cd_core install kernel-default # The compressed (-all) version results in a bigger .iso! @@ -227,12 +216,6 @@ installPattern enhanced_base install patterns-base-x11 installPattern x11 installPattern sw_management -install yast2-bootloader -install yast2-country -install yast2-hardware-detection -install yast2-network -install yast2-proxy -install yast2-storage-ng # For working with filesystems install bcache-tools @@ -298,18 +281,6 @@ install xf86-video-v4l install xf86-video-vesa #install xf86-video-voodoo install xz -install yast2-trans-de -if [ "$distro" = "leap" ]; then - install yast2-trans-cs - install yast2-trans-da - install yast2-trans-es - install yast2-trans-ja - install yast2-trans-pl - install yast2-trans-ru - install yast2-trans-sv - install yast2-trans-zh_CN - install yast2-trans-zh_TW -fi install zd1211-firmware install zip diff --git a/list-installer.sh b/list-installer.sh index 0cbaf8f..957bc42 100644 --- a/list-installer.sh +++ b/list-installer.sh @@ -1,3 +1,33 @@ +# YaST +install patterns-yast-yast2_basis +installPattern yast2_basis + +install yast2-bootloader +install yast2-country +install yast2-hardware-detection +install yast2-network +install yast2-proxy +install yast2-storage-ng +# We don't need those +buildignore yast2-samba-client +buildignore yast2-vpn +buildignore yast2-journal +buildignore yast2-auth-client +buildignore yast2-sudo + +install yast2-trans-de +if [ "$distro" = "leap" ]; then + install yast2-trans-cs + install yast2-trans-da + install yast2-trans-es + install yast2-trans-ja + install yast2-trans-pl + install yast2-trans-ru + install yast2-trans-sv + install yast2-trans-zh_CN + install yast2-trans-zh_TW +fi + # Packages for the installer install live-net-installer install skelcd-openSUSE # Needed for README.BETA diff --git a/list-x11.sh b/list-x11.sh index 3e50354..70037a6 100644 --- a/list-x11.sh +++ b/list-x11.sh @@ -34,6 +34,13 @@ buildignore sbl buildignore gnome-online-accounts buildignore snapper +# No YaST +buildignore patterns-yast-yast2_basis +buildignore yast2-control-center +buildignore yast2-control-center-qt +# Note: OBS doesn't understand this, but kiwi/zypper do. +buildignore libyui* + buildignore Mesa-libva # No python2 necessary @@ -45,7 +52,6 @@ buildignore libpeas-loader-python buildignore aspell-en buildignore ModemManager -buildignore yast2-printer buildignore avahi buildignore fprintd buildignore accountsservice @@ -128,7 +134,6 @@ install dbus-1-x11 install desktop-file-utils install libgnomesu install libxfce4ui-tools -install libyui-qt-pkg install pinentry-gtk2 install shared-mime-info install xdg-user-dirs-gtk @@ -136,7 +141,6 @@ install xdg-utils install NetworkManager-applet install xfce4-panel-plugin-xkb install xfce4-terminal -install yast2-control-center-qt buildignore argyllcms diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index c07b468..2da90c2 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -301,16 +301,6 @@ - - - - - - - - - - @@ -351,8 +341,6 @@ - - @@ -360,12 +348,6 @@ - - - - - - @@ -426,16 +408,6 @@ - - - - - - - - - - @@ -506,6 +478,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index c62f4a8..152055a 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -301,16 +301,6 @@ - - - - - - - - - - @@ -351,8 +341,6 @@ - - @@ -360,12 +348,6 @@ - - - - - - @@ -426,16 +408,6 @@ - - - - - - - - - - @@ -481,6 +453,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 5f339cd..2111aa4 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -301,16 +301,6 @@ - - - - - - - - - - @@ -351,8 +341,6 @@ - - @@ -360,12 +348,6 @@ - - - - - - @@ -426,16 +408,6 @@ - - - - - - - - - - @@ -512,6 +484,16 @@ + + + + + + + + + + @@ -524,8 +506,6 @@ - - @@ -616,7 +596,6 @@ - @@ -624,7 +603,6 @@ - diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index d4ddd76..ff5f686 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -301,16 +301,6 @@ - - - - - - - - - - @@ -351,8 +341,6 @@ - - @@ -360,12 +348,6 @@ - - - - - - @@ -426,16 +408,6 @@ - - - - - - - - - - @@ -472,6 +444,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 9a14b5a..a702212 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 17 10:22:49 UTC 2022 - Fabian Vogt + +- list-{common,x11,installer}: Don't install YaST on the rescue CD anymore + ------------------------------------------------------------------- Sun Sep 25 14:20:12 UTC 2022 - Dominique Leuenberger diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 77a79bd..fd71d4d 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -301,16 +301,6 @@ - - - - - - - - - - @@ -351,8 +341,6 @@ - - @@ -360,12 +348,6 @@ - - - - - - @@ -426,7 +408,6 @@ - @@ -497,6 +478,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 5e580ca..d4bf873 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -301,16 +301,6 @@ - - - - - - - - - - @@ -351,8 +341,6 @@ - - @@ -360,12 +348,6 @@ - - - - - - @@ -426,7 +408,6 @@ - @@ -472,6 +453,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index a5f6a41..82369df 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -301,16 +301,6 @@ - - - - - - - - - - @@ -351,8 +341,6 @@ - - @@ -360,12 +348,6 @@ - - - - - - @@ -426,7 +408,6 @@ - @@ -503,6 +484,16 @@ + + + + + + + + + + @@ -515,8 +506,6 @@ - - @@ -609,7 +598,6 @@ - @@ -617,7 +605,6 @@ - diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index f624494..7852116 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -301,16 +301,6 @@ - - - - - - - - - - @@ -351,8 +341,6 @@ - - @@ -360,12 +348,6 @@ - - - - - - @@ -426,7 +408,6 @@ - @@ -463,6 +444,25 @@ + + + + + + + + + + + + + + + + + + +