rpm/livecd-openSUSE
SHA256
1
0
Fork 0
forked from pool/livecd-openSUSE
Code Pull Requests Activity

Accepting request 845945 from home:favogt:branches:openSUSE:Factory:Live

Browse Source 
- Forcibly remove noto-coloremoji-fonts until it can be replaced with
  a buildignore
- Ignore xorg-x11-fonts-legacy everywhere

OBS-URL: https://build.opensuse.org/request/show/845945
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=80
This commit is contained in:
Fabian Vogt 2020-11-04 10:23:54 +00:00 committed by Git OBS Bridge
parent c3df6cd3ad
commit f0bde12e27
11 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.sh
View File

@ -36,6 +36,9 @@ rpm -qa | grep "^cpp" | xargs -r rpm -e --nodeps
# which has its own icons and we have breeze for the rest.
[ "$desktop" = "kde" -o "$desktop" = "x11" ] && rpm -e --nodeps adwaita-icon-theme
# Workaround until dropped from xfce4-branding-openSUSE
[ "$desktop" = "x11" -o "$desktop" = "xfce" ] && rpm -e --nodeps noto-coloremoji-fonts
#--------------------------------------
# enable and disable services

1
list-common.sh
View File

@ -96,6 +96,7 @@ buildignore efont-unicode-bitmap-fonts
buildignore baekmuk-bitmap-fonts
buildignore intlfonts-chinese-big-bitmap-fonts
buildignore xorg-x11-fonts
buildignore xorg-x11-fonts-legacy
buildignore strace
buildignore tcsh

1
list-x11.sh
View File

@ -63,7 +63,6 @@ buildignore xfce-terminal-lang
buildignore exo-lang
buildignore xfdesktop-lang
buildignore xfce4-power-manager-lang
buildignore xorg-x11-fonts-legacy
buildignore noto-sans-cjk-fonts
# Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD

2
livecd-leap-gnome.kiwi
View File

@ -218,6 +218,8 @@
<ignore name="intlfonts-chinese-big-bitmap-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts"/>
<ignore name="xorg-x11-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="strace"/>
<ignore name="strace"/>
<package name="aaa_base" replaces="tcsh"/>

2
livecd-leap-kde.kiwi
View File

@ -218,6 +218,8 @@
<ignore name="intlfonts-chinese-big-bitmap-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts"/>
<ignore name="xorg-x11-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="strace"/>
<ignore name="strace"/>
<package name="aaa_base" replaces="tcsh"/>

4
livecd-leap-x11.kiwi
View File

@ -218,6 +218,8 @@
<ignore name="intlfonts-chinese-big-bitmap-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts"/>
<ignore name="xorg-x11-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="strace"/>
<ignore name="strace"/>
<package name="aaa_base" replaces="tcsh"/>
@ -520,8 +522,6 @@
<ignore name="xfdesktop-lang"/>
<package name="aaa_base" replaces="xfce4-power-manager-lang"/>
<ignore name="xfce4-power-manager-lang"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
<ignore name="noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="cyrus-sasl"/>

7
livecd-openSUSE.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 4 09:30:39 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Forcibly remove noto-coloremoji-fonts until it can be replaced with
a buildignore
- Ignore xorg-x11-fonts-legacy everywhere
-------------------------------------------------------------------
Wed Nov 4 08:17:48 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>

2
livecd-tumbleweed-gnome.kiwi
View File

@ -218,6 +218,8 @@
<ignore name="intlfonts-chinese-big-bitmap-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts"/>
<ignore name="xorg-x11-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="strace"/>
<ignore name="strace"/>
<package name="aaa_base" replaces="tcsh"/>

2
livecd-tumbleweed-kde.kiwi
View File

@ -218,6 +218,8 @@
<ignore name="intlfonts-chinese-big-bitmap-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts"/>
<ignore name="xorg-x11-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="strace"/>
<ignore name="strace"/>
<package name="aaa_base" replaces="tcsh"/>

4
livecd-tumbleweed-x11.kiwi
View File

@ -218,6 +218,8 @@
<ignore name="intlfonts-chinese-big-bitmap-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts"/>
<ignore name="xorg-x11-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="strace"/>
<ignore name="strace"/>
<package name="aaa_base" replaces="tcsh"/>
@ -514,8 +516,6 @@
<ignore name="xfdesktop-lang"/>
<package name="aaa_base" replaces="xfce4-power-manager-lang"/>
<ignore name="xfce4-power-manager-lang"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
<ignore name="noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="cyrus-sasl"/>

2
livecd-tumbleweed-xfce.kiwi
View File

@ -218,6 +218,8 @@
<ignore name="intlfonts-chinese-big-bitmap-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts"/>
<ignore name="xorg-x11-fonts"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="strace"/>
<ignore name="strace"/>
<package name="aaa_base" replaces="tcsh"/>