1
0

Accepting request 691452 from home:favogt:yastlive

- Split packages for installation into list-installer.sh, shared
  between gnome, kde and xfce
- Require yast2_basis pattern in list-common
- Pull in skelcd-control-openSUSE for installer deps
  (boo#1131235)
- Add more fonts for the installation (boo#1131061)
- Ignore ntp, workaround for bsc#1131492

OBS-URL: https://build.opensuse.org/request/show/691452
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=30
This commit is contained in:
Fabian Vogt 2019-04-04 09:48:46 +00:00 committed by Git OBS Bridge
parent 293fe7b2c1
commit ea0a9cfa0c
14 changed files with 96 additions and 63 deletions

View File

@ -155,9 +155,7 @@ buildignore udev-configure-printer
# We don't need those
buildignore yast2-samba-client
buildignore yast2-vpn
buildignore yast2-vm
buildignore yast2-journal
buildignore yast2-nfs-client
buildignore yast2-auth-client
buildignore yast2-sudo
@ -187,6 +185,10 @@ buildignore open-vm-tools
# Pulls in tcl
buildignore usb_modeswitch
# 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
install kernel-firmware
@ -284,3 +286,7 @@ install yast2-trans-zh_CN
install yast2-trans-zh_TW
install zd1211-firmware
install zip
# Workaround for bsc#1131492
buildignore ntp

View File

@ -27,12 +27,7 @@ buildignore noto-sans-kr-regular-fonts
install libreoffice-writer
# Packages for the installer
install live-net-installer
install skelcd-openSUSE # Needed for README.BETA
install setxkbmap # Needed by yast2-keyboard
install yast2-qt-branding-openSUSE
install cracklib
install cracklib-dict-full
source "$PWD/list-installer.sh"
# Pulls in sane-backends
buildignore simple-scan

16
list-installer.sh Normal file
View File

@ -0,0 +1,16 @@
# Packages for the installer
install live-net-installer
install skelcd-openSUSE # Needed for README.BETA
install setxkbmap # Needed by yast2-keyboard
install skelcd-control-openSUSE # Just pulled in for deps
install cracklib-dict-full
# Fonts for the installation (taken from installation-images)
install thai-fonts
install lklug-fonts
install ipa-gothic-fonts
install indic-fonts
install arabic-kacst-fonts
# too big
# install un-fonts

View File

@ -26,12 +26,7 @@ buildignore kdenetwork4-filesharing
buildignore gnome-keyring
# Packages for the installer
install live-net-installer
install skelcd-openSUSE # Needed for README.BETA
install setxkbmap # Needed by yast2-keyboard
install yast2-qt-branding-openSUSE
install cracklib
install cracklib-dict-full
source "$PWD/list-installer.sh"
buildignore oxygen5-icon-theme-large
buildignore gwenview5

View File

@ -31,7 +31,6 @@ buildignore python-base
buildignore aspell-en
buildignore ModemManager
buildignore yast2-users
buildignore yast2-printer
buildignore avahi
buildignore fprintd

View File

@ -18,12 +18,7 @@ buildignore sbl
buildignore gnome-online-accounts
# Packages for the installer
install live-net-installer
install skelcd-openSUSE # Needed for README.BETA
install setxkbmap # Needed by yast2-keyboard
install yast2-qt-branding-openSUSE
install cracklib
install cracklib-dict-full
source "$PWD/list-installer.sh"
buildignore aspell-en
install libxslt-tools

View File

@ -280,12 +280,8 @@
<ignore name="yast2-samba-client"/>
<package name="aaa_base" replaces="yast2-vpn"/>
<ignore name="yast2-vpn"/>
<package name="aaa_base" replaces="yast2-vm"/>
<ignore name="yast2-vm"/>
<package name="aaa_base" replaces="yast2-journal"/>
<ignore name="yast2-journal"/>
<package name="aaa_base" replaces="yast2-nfs-client"/>
<ignore name="yast2-nfs-client"/>
<package name="aaa_base" replaces="yast2-auth-client"/>
<ignore name="yast2-auth-client"/>
<package name="aaa_base" replaces="yast2-sudo"/>
@ -309,6 +305,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
<package name="kernel-firmware"/>
<package name="patterns-base-enhanced_base"/>
@ -403,6 +401,8 @@
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<!-- list-gnome.sh -->
<package name="aaa_base" replaces="libreoffice-calc"/>
@ -449,9 +449,13 @@
<package name="live-net-installer"/>
<package name="skelcd-openSUSE"/>
<package name="setxkbmap"/>
<package name="yast2-qt-branding-openSUSE"/>
<package name="cracklib"/>
<package name="skelcd-control-openSUSE"/>
<package name="cracklib-dict-full"/>
<package name="thai-fonts"/>
<package name="lklug-fonts"/>
<package name="ipa-gothic-fonts"/>
<package name="indic-fonts"/>
<package name="arabic-kacst-fonts"/>
<package name="aaa_base" replaces="simple-scan"/>
<ignore name="simple-scan"/>
<package name="aaa_base" replaces="ghostscript"/>

View File

@ -280,12 +280,8 @@
<ignore name="yast2-samba-client"/>
<package name="aaa_base" replaces="yast2-vpn"/>
<ignore name="yast2-vpn"/>
<package name="aaa_base" replaces="yast2-vm"/>
<ignore name="yast2-vm"/>
<package name="aaa_base" replaces="yast2-journal"/>
<ignore name="yast2-journal"/>
<package name="aaa_base" replaces="yast2-nfs-client"/>
<ignore name="yast2-nfs-client"/>
<package name="aaa_base" replaces="yast2-auth-client"/>
<ignore name="yast2-auth-client"/>
<package name="aaa_base" replaces="yast2-sudo"/>
@ -309,6 +305,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
<package name="kernel-firmware"/>
<package name="patterns-base-enhanced_base"/>
@ -403,6 +401,8 @@
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<!-- list-kde.sh -->
<package name="aaa_base" replaces="gvfs"/>
@ -450,9 +450,13 @@
<package name="live-net-installer"/>
<package name="skelcd-openSUSE"/>
<package name="setxkbmap"/>
<package name="yast2-qt-branding-openSUSE"/>
<package name="cracklib"/>
<package name="skelcd-control-openSUSE"/>
<package name="cracklib-dict-full"/>
<package name="thai-fonts"/>
<package name="lklug-fonts"/>
<package name="ipa-gothic-fonts"/>
<package name="indic-fonts"/>
<package name="arabic-kacst-fonts"/>
<package name="aaa_base" replaces="oxygen5-icon-theme-large"/>
<ignore name="oxygen5-icon-theme-large"/>
<package name="aaa_base" replaces="gwenview5"/>

View File

@ -280,12 +280,8 @@
<ignore name="yast2-samba-client"/>
<package name="aaa_base" replaces="yast2-vpn"/>
<ignore name="yast2-vpn"/>
<package name="aaa_base" replaces="yast2-vm"/>
<ignore name="yast2-vm"/>
<package name="aaa_base" replaces="yast2-journal"/>
<ignore name="yast2-journal"/>
<package name="aaa_base" replaces="yast2-nfs-client"/>
<ignore name="yast2-nfs-client"/>
<package name="aaa_base" replaces="yast2-auth-client"/>
<ignore name="yast2-auth-client"/>
<package name="aaa_base" replaces="yast2-sudo"/>
@ -309,6 +305,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
<package name="kernel-firmware"/>
<package name="patterns-base-enhanced_base"/>
@ -403,6 +401,8 @@
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<!-- list-x11.sh -->
<package name="aaa_base" replaces="PackageKit"/>
@ -463,8 +463,6 @@
<ignore name="aspell-en"/>
<package name="aaa_base" replaces="ModemManager"/>
<ignore name="ModemManager"/>
<package name="aaa_base" replaces="yast2-users"/>
<ignore name="yast2-users"/>
<package name="aaa_base" replaces="yast2-printer"/>
<ignore name="yast2-printer"/>
<package name="aaa_base" replaces="avahi"/>

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Apr 3 14:45:56 UTC 2019 - Fabian Vogt <fvogt@suse.com>
- Split packages for installation into list-installer.sh, shared
between gnome, kde and xfce
- Require yast2_basis pattern in list-common
- Pull in skelcd-control-openSUSE for installer deps
(boo#1131235)
- Add more fonts for the installation (boo#1131061)
- Ignore ntp, workaround for bsc#1131492
-------------------------------------------------------------------
Mon Mar 25 15:59:12 UTC 2019 - Fabian Vogt <fvogt@suse.com>

View File

@ -280,12 +280,8 @@
<ignore name="yast2-samba-client"/>
<package name="aaa_base" replaces="yast2-vpn"/>
<ignore name="yast2-vpn"/>
<package name="aaa_base" replaces="yast2-vm"/>
<ignore name="yast2-vm"/>
<package name="aaa_base" replaces="yast2-journal"/>
<ignore name="yast2-journal"/>
<package name="aaa_base" replaces="yast2-nfs-client"/>
<ignore name="yast2-nfs-client"/>
<package name="aaa_base" replaces="yast2-auth-client"/>
<ignore name="yast2-auth-client"/>
<package name="aaa_base" replaces="yast2-sudo"/>
@ -309,6 +305,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
<package name="kernel-firmware"/>
<package name="patterns-base-enhanced_base"/>
@ -403,6 +401,8 @@
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<!-- list-gnome.sh -->
<package name="aaa_base" replaces="libreoffice-calc"/>
@ -449,9 +449,13 @@
<package name="live-net-installer"/>
<package name="skelcd-openSUSE"/>
<package name="setxkbmap"/>
<package name="yast2-qt-branding-openSUSE"/>
<package name="cracklib"/>
<package name="skelcd-control-openSUSE"/>
<package name="cracklib-dict-full"/>
<package name="thai-fonts"/>
<package name="lklug-fonts"/>
<package name="ipa-gothic-fonts"/>
<package name="indic-fonts"/>
<package name="arabic-kacst-fonts"/>
<package name="aaa_base" replaces="simple-scan"/>
<ignore name="simple-scan"/>
<package name="aaa_base" replaces="ghostscript"/>

View File

@ -280,12 +280,8 @@
<ignore name="yast2-samba-client"/>
<package name="aaa_base" replaces="yast2-vpn"/>
<ignore name="yast2-vpn"/>
<package name="aaa_base" replaces="yast2-vm"/>
<ignore name="yast2-vm"/>
<package name="aaa_base" replaces="yast2-journal"/>
<ignore name="yast2-journal"/>
<package name="aaa_base" replaces="yast2-nfs-client"/>
<ignore name="yast2-nfs-client"/>
<package name="aaa_base" replaces="yast2-auth-client"/>
<ignore name="yast2-auth-client"/>
<package name="aaa_base" replaces="yast2-sudo"/>
@ -309,6 +305,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
<package name="kernel-firmware"/>
<package name="patterns-base-enhanced_base"/>
@ -403,6 +401,8 @@
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<!-- list-kde.sh -->
<package name="aaa_base" replaces="gvfs"/>
@ -450,9 +450,13 @@
<package name="live-net-installer"/>
<package name="skelcd-openSUSE"/>
<package name="setxkbmap"/>
<package name="yast2-qt-branding-openSUSE"/>
<package name="cracklib"/>
<package name="skelcd-control-openSUSE"/>
<package name="cracklib-dict-full"/>
<package name="thai-fonts"/>
<package name="lklug-fonts"/>
<package name="ipa-gothic-fonts"/>
<package name="indic-fonts"/>
<package name="arabic-kacst-fonts"/>
<package name="aaa_base" replaces="oxygen5-icon-theme-large"/>
<ignore name="oxygen5-icon-theme-large"/>
<package name="aaa_base" replaces="gwenview5"/>

View File

@ -280,12 +280,8 @@
<ignore name="yast2-samba-client"/>
<package name="aaa_base" replaces="yast2-vpn"/>
<ignore name="yast2-vpn"/>
<package name="aaa_base" replaces="yast2-vm"/>
<ignore name="yast2-vm"/>
<package name="aaa_base" replaces="yast2-journal"/>
<ignore name="yast2-journal"/>
<package name="aaa_base" replaces="yast2-nfs-client"/>
<ignore name="yast2-nfs-client"/>
<package name="aaa_base" replaces="yast2-auth-client"/>
<ignore name="yast2-auth-client"/>
<package name="aaa_base" replaces="yast2-sudo"/>
@ -309,6 +305,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
<package name="kernel-firmware"/>
<package name="patterns-base-enhanced_base"/>
@ -403,6 +401,8 @@
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<!-- list-x11.sh -->
<package name="aaa_base" replaces="PackageKit"/>
@ -463,8 +463,6 @@
<ignore name="aspell-en"/>
<package name="aaa_base" replaces="ModemManager"/>
<ignore name="ModemManager"/>
<package name="aaa_base" replaces="yast2-users"/>
<ignore name="yast2-users"/>
<package name="aaa_base" replaces="yast2-printer"/>
<ignore name="yast2-printer"/>
<package name="aaa_base" replaces="avahi"/>

View File

@ -280,12 +280,8 @@
<ignore name="yast2-samba-client"/>
<package name="aaa_base" replaces="yast2-vpn"/>
<ignore name="yast2-vpn"/>
<package name="aaa_base" replaces="yast2-vm"/>
<ignore name="yast2-vm"/>
<package name="aaa_base" replaces="yast2-journal"/>
<ignore name="yast2-journal"/>
<package name="aaa_base" replaces="yast2-nfs-client"/>
<ignore name="yast2-nfs-client"/>
<package name="aaa_base" replaces="yast2-auth-client"/>
<ignore name="yast2-auth-client"/>
<package name="aaa_base" replaces="yast2-sudo"/>
@ -309,6 +305,8 @@
<ignore name="open-vm-tools"/>
<package name="aaa_base" replaces="usb_modeswitch"/>
<ignore name="usb_modeswitch"/>
<package name="patterns-yast-yast2_basis"/>
<namedCollection name="yast2_basis"/>
<package name="kernel-default"/>
<package name="kernel-firmware"/>
<package name="patterns-base-enhanced_base"/>
@ -403,6 +401,8 @@
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
<ignore name="ntp"/>
<!-- list-xfce.sh -->
<package name="branding-openSUSE"/>
@ -439,9 +439,13 @@
<package name="live-net-installer"/>
<package name="skelcd-openSUSE"/>
<package name="setxkbmap"/>
<package name="yast2-qt-branding-openSUSE"/>
<package name="cracklib"/>
<package name="skelcd-control-openSUSE"/>
<package name="cracklib-dict-full"/>
<package name="thai-fonts"/>
<package name="lklug-fonts"/>
<package name="ipa-gothic-fonts"/>
<package name="indic-fonts"/>
<package name="arabic-kacst-fonts"/>
<package name="aaa_base" replaces="aspell-en"/>
<ignore name="aspell-en"/>
<package name="libxslt-tools"/>