forked from pool/livecd-openSUSE
Accepting request 851354 from home:favogt:branches:openSUSE:Factory:Live
- Also drop files from /usr/lib/locale and /usr/share/qt5/translations - Also drop zh* locales - Don't enable spice-vdagentd.service, that's done by udev - Don't try to delete netronome firmware twice - Add upgrade.desktop on xfce as well - Switch "leap" back to "Leap" for 15.3 OBS-URL: https://build.opensuse.org/request/show/851354 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=82
This commit is contained in:
Git OBS Bridge
parent
f0bde12e27
commit
c5e7637e71
31
config.sh
31
config.sh
@ -42,7 +42,7 @@ rpm -qa | grep "^cpp" | xargs -r rpm -e --nodeps
|
||||
#--------------------------------------
|
||||
# enable and disable services
|
||||
|
||||
for i in langset NetworkManager firewalld spice-vdagentd; do
|
||||
for i in langset NetworkManager firewalld; do
|
||||
systemctl -f enable $i
|
||||
done
|
||||
|
||||
@ -70,7 +70,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/share/locale/{uk,sv,ru,ja,da,cs,sr,vi}
|
||||
rm -rf /usr/{lib,share}/locale/{ca,cs,da,ja,fi,id,nl,pl,tr,ru,sk,sr,sv,uk,vi,cmn_TW,zh}*
|
||||
rm -rf /usr/share/qt5/translations/*_{ca,cs,da,ja,fi,id,nl,pl,tr,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
|
||||
@ -107,31 +108,20 @@ pam-config -a --nullok
|
||||
|
||||
: > /var/log/zypper.log
|
||||
|
||||
# Add Installation and upgrade icons to the desktop
|
||||
if [ "$desktop" = "kde" ]; then
|
||||
# bug 989897, avoid creating desktop directory on KDE so that the default items are added on first login
|
||||
cp /usr/share/applications/installation.desktop /usr/share/kio_desktop/DesktopLinks/
|
||||
# Also show the update icon if the .desktop file is available
|
||||
cp /usr/share/applications/upgrade.desktop /usr/share/kio_desktop/DesktopLinks/ || :
|
||||
cp /usr/share/applications/{installation,upgrade}.desktop /usr/share/kio_desktop/DesktopLinks/
|
||||
# Set the application as being "trusted"
|
||||
chmod a+x /usr/share/kio_desktop/DesktopLinks/installation.desktop
|
||||
chmod a+x /usr/share/kio_desktop/DesktopLinks/upgrade.desktop || :
|
||||
chmod a+x /usr/share/kio_desktop/DesktopLinks/{installation,upgrade}.desktop
|
||||
elif [ "$desktop" = "xfce" ]; then
|
||||
# Add Installation icon to desktop folder
|
||||
mkdir -p /home/linux/.config /home/linux/Desktop
|
||||
echo 'XDG_DESKTOP_DIR="$HOME/Desktop"' > /home/linux/.config/user-dirs.dirs
|
||||
cp /usr/share/applications/installation.desktop /home/linux/Desktop/
|
||||
cp /usr/share/applications/{installation,upgrade}.desktop /home/linux/Desktop/
|
||||
# Set the application as being "trusted"
|
||||
chown -R linux /home/linux/Desktop/installation.desktop
|
||||
chmod a+x /home/linux/Desktop/installation.desktop
|
||||
# else case disabled: 'x11' (rescue) does not contain the installer, GNOME Shell has no concept of 'desktop'
|
||||
#else
|
||||
# # Add Installation icon to desktop folder
|
||||
# mkdir -p /home/linux/.config /home/linux/Desktop
|
||||
# echo 'XDG_DESKTOP_DIR="$HOME/Desktop"' > /home/linux/.config/user-dirs.dirs
|
||||
# ln -s /usr/share/applications/installation.desktop /home/linux/Desktop/
|
||||
# # Set the application as being "trusted"
|
||||
# chmod a+x /home/linux/Desktop/installation.desktop
|
||||
chmod a+x /home/linux/Desktop/{installation,upgrade}.desktop
|
||||
fi
|
||||
# 'x11' (rescue) does not contain the installer, GNOME Shell has no concept of 'desktop'
|
||||
|
||||
chown -R linux /home/linux
|
||||
|
||||
@ -163,9 +153,6 @@ echo "Storage=volatile" >> /etc/systemd/journald.conf
|
||||
# Remove generated files (boo#1098535)
|
||||
rm -rf /var/cache/zypp/* /var/lib/zypp/AnonymousUniqueId /var/lib/systemd/random-seed
|
||||
|
||||
# Remove netronome firmware (part of kernel-firmware): this sums up to 125MB
|
||||
rm -rf /lib/firmware/netronome/
|
||||
|
||||
cat >/etc/systemd/system/fixupbootloader.service <<EOF
|
||||
# boo#1155545 - LOADER_TYPE has to be nil for the upgrade to work properly.
|
||||
# Kiwi does not allow changing the file directly, so do it in this ugly way.
|
||||
|
||||
@ -3,6 +3,7 @@ buildignore tin
|
||||
buildignore desktop-translations
|
||||
buildignore ft2demos
|
||||
buildignore gimp-help
|
||||
buildignore gimp-lang
|
||||
buildignore libreoffice-base
|
||||
buildignore libreoffice-mailmerge
|
||||
buildignore libreoffice-math
|
||||
|
||||
@ -53,7 +53,6 @@ buildignore patterns-kde-kde_pim
|
||||
|
||||
buildignore digikam
|
||||
buildignore gdb
|
||||
buildignore gimp-lang
|
||||
buildignore hugin
|
||||
buildignore icewm
|
||||
buildignore kmahjongg-lang
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
|
||||
|
||||
<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Jump %OS_VERSION_ID% GNOME Live">
|
||||
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
|
||||
<description type="system">
|
||||
<author>openSUSE Project</author>
|
||||
<contact>opensuse@opensuse.org</contact>
|
||||
@ -13,7 +13,7 @@
|
||||
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
|
||||
</profiles>
|
||||
<preferences profiles="EFI">
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Jump_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
|
||||
<version>2.8.0</version>
|
||||
<bootloader-theme>openSUSE</bootloader-theme>
|
||||
<bootsplash-theme>bgrt</bootsplash-theme>
|
||||
@ -23,7 +23,7 @@
|
||||
<rpm-excludedocs>true</rpm-excludedocs>
|
||||
</preferences>
|
||||
<preferences profiles="noEFI">
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Jump_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
|
||||
<version>2.8.0</version>
|
||||
<bootloader-theme>openSUSE</bootloader-theme>
|
||||
<bootsplash-theme>bgrt</bootsplash-theme>
|
||||
@ -67,6 +67,8 @@
|
||||
<ignore name="ft2demos"/>
|
||||
<package name="aaa_base" replaces="gimp-help"/>
|
||||
<ignore name="gimp-help"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="libreoffice-base"/>
|
||||
<ignore name="libreoffice-base"/>
|
||||
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
|
||||
|
||||
<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Jump %OS_VERSION_ID% KDE Live">
|
||||
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
|
||||
<description type="system">
|
||||
<author>openSUSE Project</author>
|
||||
<contact>opensuse@opensuse.org</contact>
|
||||
@ -13,7 +13,7 @@
|
||||
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
|
||||
</profiles>
|
||||
<preferences profiles="EFI">
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Jump_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
|
||||
<version>2.8.0</version>
|
||||
<bootloader-theme>openSUSE</bootloader-theme>
|
||||
<bootsplash-theme>bgrt</bootsplash-theme>
|
||||
@ -23,7 +23,7 @@
|
||||
<rpm-excludedocs>true</rpm-excludedocs>
|
||||
</preferences>
|
||||
<preferences profiles="noEFI">
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Jump_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
|
||||
<version>2.8.0</version>
|
||||
<bootloader-theme>openSUSE</bootloader-theme>
|
||||
<bootsplash-theme>bgrt</bootsplash-theme>
|
||||
@ -67,6 +67,8 @@
|
||||
<ignore name="ft2demos"/>
|
||||
<package name="aaa_base" replaces="gimp-help"/>
|
||||
<ignore name="gimp-help"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="libreoffice-base"/>
|
||||
<ignore name="libreoffice-base"/>
|
||||
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
|
||||
@ -480,8 +482,6 @@
|
||||
<ignore name="digikam"/>
|
||||
<package name="aaa_base" replaces="gdb"/>
|
||||
<ignore name="gdb"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="hugin"/>
|
||||
<ignore name="hugin"/>
|
||||
<package name="aaa_base" replaces="icewm"/>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
|
||||
|
||||
<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Jump %OS_VERSION_ID% Rescue CD">
|
||||
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
|
||||
<description type="system">
|
||||
<author>openSUSE Project</author>
|
||||
<contact>opensuse@opensuse.org</contact>
|
||||
@ -13,7 +13,7 @@
|
||||
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
|
||||
</profiles>
|
||||
<preferences profiles="EFI">
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Jump_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
|
||||
<version>2.8.0</version>
|
||||
<bootloader-theme>openSUSE</bootloader-theme>
|
||||
<bootsplash-theme>bgrt</bootsplash-theme>
|
||||
@ -23,7 +23,7 @@
|
||||
<rpm-excludedocs>true</rpm-excludedocs>
|
||||
</preferences>
|
||||
<preferences profiles="noEFI">
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Jump_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
|
||||
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
|
||||
<version>2.8.0</version>
|
||||
<bootloader-theme>openSUSE</bootloader-theme>
|
||||
<bootsplash-theme>bgrt</bootsplash-theme>
|
||||
@ -67,6 +67,8 @@
|
||||
<ignore name="ft2demos"/>
|
||||
<package name="aaa_base" replaces="gimp-help"/>
|
||||
<ignore name="gimp-help"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="libreoffice-base"/>
|
||||
<ignore name="libreoffice-base"/>
|
||||
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
|
||||
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 27 12:49:12 UTC 2020 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Also drop files from /usr/lib/locale and /usr/share/qt5/translations
|
||||
- Also drop zh* locales
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 27 07:57:16 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
|
||||
|
||||
- Ignore gimp-lang on all flavors, not only kde (mainly needed on
|
||||
xfce, where space is tight).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 16 10:15:46 UTC 2020 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Don't enable spice-vdagentd.service, that's done by udev
|
||||
- Don't try to delete netronome firmware twice
|
||||
- Add upgrade.desktop on xfce as well
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 4 12:38:52 UTC 2020 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Switch "leap" back to "Leap" for 15.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 4 09:30:39 UTC 2020 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
|
||||
@ -67,6 +67,8 @@
|
||||
<ignore name="ft2demos"/>
|
||||
<package name="aaa_base" replaces="gimp-help"/>
|
||||
<ignore name="gimp-help"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="libreoffice-base"/>
|
||||
<ignore name="libreoffice-base"/>
|
||||
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
|
||||
|
||||
@ -67,6 +67,8 @@
|
||||
<ignore name="ft2demos"/>
|
||||
<package name="aaa_base" replaces="gimp-help"/>
|
||||
<ignore name="gimp-help"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="libreoffice-base"/>
|
||||
<ignore name="libreoffice-base"/>
|
||||
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
|
||||
@ -474,8 +476,6 @@
|
||||
<ignore name="digikam"/>
|
||||
<package name="aaa_base" replaces="gdb"/>
|
||||
<ignore name="gdb"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="hugin"/>
|
||||
<ignore name="hugin"/>
|
||||
<package name="aaa_base" replaces="icewm"/>
|
||||
|
||||
@ -67,6 +67,8 @@
|
||||
<ignore name="ft2demos"/>
|
||||
<package name="aaa_base" replaces="gimp-help"/>
|
||||
<ignore name="gimp-help"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="libreoffice-base"/>
|
||||
<ignore name="libreoffice-base"/>
|
||||
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
|
||||
|
||||
@ -67,6 +67,8 @@
|
||||
<ignore name="ft2demos"/>
|
||||
<package name="aaa_base" replaces="gimp-help"/>
|
||||
<ignore name="gimp-help"/>
|
||||
<package name="aaa_base" replaces="gimp-lang"/>
|
||||
<ignore name="gimp-lang"/>
|
||||
<package name="aaa_base" replaces="libreoffice-base"/>
|
||||
<ignore name="libreoffice-base"/>
|
||||
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
|
||||
|
||||
@ -36,7 +36,7 @@ for distro in leap tumbleweed; do
|
||||
bootsplash="bgrt"
|
||||
releaseprefix="openSUSE"
|
||||
if [ "${distro}" = "leap" ]; then
|
||||
distroname="openSUSE Jump %OS_VERSION_ID%"
|
||||
distroname="openSUSE Leap %OS_VERSION_ID%"
|
||||
# This changes every few weeks, apparently.
|
||||
#releaseprefix="Leap"
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user