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

Accepting request 993707 from Virtualization:Appliances:Images:openSUSE-Tumbleweed

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/993707
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=187
This commit is contained in:
Dominique Leuenberger 2022-08-08 08:41:21 +00:00 committed by Git OBS Bridge
commit 6371fadf8e
13 changed files with 69 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_constraints
View File

@ -1,7 +1,7 @@
<constraints>
<hardware>
<disk>
<size unit="G">18</size>
<size unit="G">20</size>
</disk>
</hardware>
</constraints>

4
config.sh
View File

@ -36,7 +36,9 @@ rpm -qa | grep "^libisl" | xargs -r rpm -e
# Workaround until dropped from xfce4-branding-openSUSE
if [ "$desktop" = "x11" -o "$desktop" = "xfce" ]; then
rpm -e --nodeps xorg-x11-server-Xvfb
if rpm -q xorg-x11-server-Xvfb; then
rpm -e --nodeps xorg-x11-server-Xvfb
fi
rpm -e --nodeps noto-coloremoji-fonts || rpm -e --nodeps google-noto-coloremoji-fonts
fi

3
list-common.sh
View File

@ -317,6 +317,3 @@ install zip
# Workaround for bsc#1131492
buildignore ntp
# ignore alsa-plugins-pulse for noe
buildignore alsa-plugins-pulse

23
list-gnome.sh
View File

@ -13,16 +13,19 @@ install branding-openSUSE
install adobe-sourcecodepro-fonts
buildignore google-carlito-fonts
buildignore noto-sans-fonts
buildignore google-noto-sans-cjk-fonts
buildignore google-noto-sans-sc-bold-fonts
buildignore google-noto-sans-sc-regular-fonts
buildignore google-noto-sans-tc-bold-fonts
buildignore google-noto-sans-tc-regular-fonts
buildignore google-noto-sans-jp-bold-fonts
buildignore google-noto-sans-jp-regular-fonts
buildignore google-noto-sans-kr-bold-fonts
buildignore google-noto-sans-kr-regular-fonts
# Was renamed in TW
for prefix in google- ""; do
buildignore ${prefix}noto-sans-fonts
buildignore ${prefix}noto-sans-cjk-fonts
buildignore ${prefix}noto-sans-sc-bold-fonts
buildignore ${prefix}noto-sans-sc-regular-fonts
buildignore ${prefix}noto-sans-tc-bold-fonts
buildignore ${prefix}noto-sans-tc-regular-fonts
buildignore ${prefix}noto-sans-jp-bold-fonts
buildignore ${prefix}noto-sans-jp-regular-fonts
buildignore ${prefix}noto-sans-kr-bold-fonts
buildignore ${prefix}noto-sans-kr-regular-fonts
done
# Expected by openQA - But no more space on the CD
# install libreoffice-writer

26
livecd-leap-gnome.kiwi
View File

@ -437,8 +437,6 @@
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<package name="aaa_base" replaces="alsa-plugins-pulse"/>
<ignore name="alsa-plugins-pulse"/>
<!-- list-gnome.sh -->
<package name="aaa_base" replaces="libreoffice-calc"/>
@ -463,8 +461,8 @@
<package name="adobe-sourcecodepro-fonts"/>
<package name="aaa_base" replaces="google-carlito-fonts"/>
<ignore name="google-carlito-fonts"/>
<package name="aaa_base" replaces="noto-sans-fonts"/>
<ignore name="noto-sans-fonts"/>
<package name="aaa_base" replaces="google-noto-sans-fonts"/>
<ignore name="google-noto-sans-fonts"/>
<package name="aaa_base" replaces="google-noto-sans-cjk-fonts"/>
<ignore name="google-noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="google-noto-sans-sc-bold-fonts"/>
@ -483,6 +481,26 @@
<ignore name="google-noto-sans-kr-bold-fonts"/>
<package name="aaa_base" replaces="google-noto-sans-kr-regular-fonts"/>
<ignore name="google-noto-sans-kr-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-fonts"/>
<ignore name="noto-sans-fonts"/>
<package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
<ignore name="noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="noto-sans-sc-bold-fonts"/>
<ignore name="noto-sans-sc-bold-fonts"/>
<package name="aaa_base" replaces="noto-sans-sc-regular-fonts"/>
<ignore name="noto-sans-sc-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-tc-bold-fonts"/>
<ignore name="noto-sans-tc-bold-fonts"/>
<package name="aaa_base" replaces="noto-sans-tc-regular-fonts"/>
<ignore name="noto-sans-tc-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-jp-bold-fonts"/>
<ignore name="noto-sans-jp-bold-fonts"/>
<package name="aaa_base" replaces="noto-sans-jp-regular-fonts"/>
<ignore name="noto-sans-jp-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-kr-bold-fonts"/>
<ignore name="noto-sans-kr-bold-fonts"/>
<package name="aaa_base" replaces="noto-sans-kr-regular-fonts"/>
<ignore name="noto-sans-kr-regular-fonts"/>
<package name="aaa_base" replaces="libreoffice"/>
<ignore name="libreoffice"/>
<package name="live-net-installer"/>

2
livecd-leap-kde.kiwi
View File

@ -437,8 +437,6 @@
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<package name="aaa_base" replaces="alsa-plugins-pulse"/>
<ignore name="alsa-plugins-pulse"/>
<!-- list-kde.sh -->
<package name="aaa_base" replaces="gvfs"/>

2
livecd-leap-x11.kiwi
View File

@ -437,8 +437,6 @@
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<package name="aaa_base" replaces="alsa-plugins-pulse"/>
<ignore name="alsa-plugins-pulse"/>
<!-- list-x11.sh -->
<package name="aaa_base" replaces="NetworkManager-lang"/>

2
livecd-leap-xfce.kiwi
View File

@ -437,8 +437,6 @@
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<package name="aaa_base" replaces="alsa-plugins-pulse"/>
<ignore name="alsa-plugins-pulse"/>
<!-- list-xfce.sh -->
<package name="branding-openSUSE"/>

8
livecd-openSUSE.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Aug 8 07:51:52 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Delete xorg-x11-server-Xvfb only if installed
- Make list-gnome compatible with Leap again
- Don't ignore alsa-plugins-pulse anymore, no longer needed
- Raise disk size constraint to 20GiB to fix occasional build failures
-------------------------------------------------------------------
Wed Aug 3 05:53:28 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>

26
livecd-tumbleweed-gnome.kiwi
View File

@ -431,8 +431,6 @@
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<package name="aaa_base" replaces="alsa-plugins-pulse"/>
<ignore name="alsa-plugins-pulse"/>
<!-- list-gnome.sh -->
<package name="aaa_base" replaces="libreoffice-calc"/>
@ -457,8 +455,8 @@
<package name="adobe-sourcecodepro-fonts"/>
<package name="aaa_base" replaces="google-carlito-fonts"/>
<ignore name="google-carlito-fonts"/>
<package name="aaa_base" replaces="noto-sans-fonts"/>
<ignore name="noto-sans-fonts"/>
<package name="aaa_base" replaces="google-noto-sans-fonts"/>
<ignore name="google-noto-sans-fonts"/>
<package name="aaa_base" replaces="google-noto-sans-cjk-fonts"/>
<ignore name="google-noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="google-noto-sans-sc-bold-fonts"/>
@ -477,6 +475,26 @@
<ignore name="google-noto-sans-kr-bold-fonts"/>
<package name="aaa_base" replaces="google-noto-sans-kr-regular-fonts"/>
<ignore name="google-noto-sans-kr-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-fonts"/>
<ignore name="noto-sans-fonts"/>
<package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
<ignore name="noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="noto-sans-sc-bold-fonts"/>
<ignore name="noto-sans-sc-bold-fonts"/>
<package name="aaa_base" replaces="noto-sans-sc-regular-fonts"/>
<ignore name="noto-sans-sc-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-tc-bold-fonts"/>
<ignore name="noto-sans-tc-bold-fonts"/>
<package name="aaa_base" replaces="noto-sans-tc-regular-fonts"/>
<ignore name="noto-sans-tc-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-jp-bold-fonts"/>
<ignore name="noto-sans-jp-bold-fonts"/>
<package name="aaa_base" replaces="noto-sans-jp-regular-fonts"/>
<ignore name="noto-sans-jp-regular-fonts"/>
<package name="aaa_base" replaces="noto-sans-kr-bold-fonts"/>
<ignore name="noto-sans-kr-bold-fonts"/>
<package name="aaa_base" replaces="noto-sans-kr-regular-fonts"/>
<ignore name="noto-sans-kr-regular-fonts"/>
<package name="aaa_base" replaces="libreoffice"/>
<ignore name="libreoffice"/>
<package name="live-net-installer"/>

2
livecd-tumbleweed-kde.kiwi
View File

@ -431,8 +431,6 @@
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<package name="aaa_base" replaces="alsa-plugins-pulse"/>
<ignore name="alsa-plugins-pulse"/>
<!-- list-kde.sh -->
<package name="aaa_base" replaces="gvfs"/>

2
livecd-tumbleweed-x11.kiwi
View File

@ -431,8 +431,6 @@
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<package name="aaa_base" replaces="alsa-plugins-pulse"/>
<ignore name="alsa-plugins-pulse"/>
<!-- list-x11.sh -->
<package name="aaa_base" replaces="NetworkManager-lang"/>

2
livecd-tumbleweed-xfce.kiwi
View File

@ -431,8 +431,6 @@
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<package name="aaa_base" replaces="alsa-plugins-pulse"/>
<ignore name="alsa-plugins-pulse"/>
<!-- list-xfce.sh -->
<package name="branding-openSUSE"/>