pool/livecd-openSUSE
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Block systemd-doc from all flavors, not only xfce.

Browse Source 
- Do only use set -u: set -e causes issues with stepping out of the
  for loop using continue.
- Skip the for loop early: no reason to calculate the PACKAGES list
  and then not consume it.
- Use tr [:lower:] [:upper:] instead of tr a-z A-Z.

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=123
This commit is contained in:
Dominique Leuenberger 2020-11-04 08:18:28 +00:00 committed by Git OBS Bridge
parent 2a1744d246
commit 5cfcf3f075
11 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
list-common.sh
View File

@ -164,6 +164,7 @@ buildignore yast2-sudo
# systemd-coredump makes no sense on a live image: there are no debuginfo installed
buildignore systemd-coredump
buildignore systemd-doc
# VPNC is no longer
buildignore NetworkManager-vpnc-gnome

1
list-xfce.sh
View File

@ -24,7 +24,6 @@ install libxslt-tools
# Remove useless xfce panel plugins
buildignore xfce4-panel-plugin-xkb
buildignore xfce4-panel-plugin-notes
buildignore systemd-doc
buildignore engrampa-lang
# Remove Libreoffice as it's too big

2
livecd-leap-gnome.kiwi
View File

@ -296,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
<package name="aaa_base" replaces="systemd-doc"/>
<ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>

2
livecd-leap-kde.kiwi
View File

@ -296,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
<package name="aaa_base" replaces="systemd-doc"/>
<ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>

4
livecd-leap-x11.kiwi
View File

@ -296,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
<package name="aaa_base" replaces="systemd-doc"/>
<ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@ -518,6 +520,8 @@
<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"/>
<ignore name="cyrus-sasl"/>
<package name="aaa_base" replaces="deltarpm"/>

14
livecd-openSUSE.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Nov 4 08:17:48 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- Block systemd-doc from all flavors, not only xfce.
-------------------------------------------------------------------
Fri Oct 30 10:10:31 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- Do only use set -u: set -e causes issues with stepping out of the
for loop using continue.
- Skip the for loop early: no reason to calculate the PACKAGES list
and then not consume it.
- Use tr [:lower:] [:upper:] instead of tr a-z A-Z.
-------------------------------------------------------------------
Mon Sep 7 09:07:51 UTC 2020 - Fabian Vogt <fvogt@suse.com>

2
livecd-tumbleweed-gnome.kiwi
View File

@ -296,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
<package name="aaa_base" replaces="systemd-doc"/>
<ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>

2
livecd-tumbleweed-kde.kiwi
View File

@ -296,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
<package name="aaa_base" replaces="systemd-doc"/>
<ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>

6
livecd-tumbleweed-x11.kiwi
View File

@ -69,8 +69,6 @@
<ignore name="gimp-help"/>
<package name="aaa_base" replaces="libreoffice-base"/>
<ignore name="libreoffice-base"/>
<package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
<ignore name="noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
<ignore name="libreoffice-mailmerge"/>
<package name="aaa_base" replaces="libreoffice-math"/>
@ -298,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
<package name="aaa_base" replaces="systemd-doc"/>
<ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@ -514,6 +514,8 @@
<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"/>
<ignore name="cyrus-sasl"/>
<package name="aaa_base" replaces="deltarpm"/>

4
livecd-tumbleweed-xfce.kiwi
View File

@ -298,8 +298,6 @@
<ignore name="systemd-coredump"/>
<package name="aaa_base" replaces="systemd-doc"/>
<ignore name="systemd-doc"/>
<package name="aaa_base" replaces="engrampa-lang"/>
<ignore name="engrampa-lang"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@ -441,6 +439,8 @@
<ignore name="xfce4-panel-plugin-xkb"/>
<package name="aaa_base" replaces="xfce4-panel-plugin-notes"/>
<ignore name="xfce4-panel-plugin-notes"/>
<package name="aaa_base" replaces="engrampa-lang"/>
<ignore name="engrampa-lang"/>
<package name="aaa_base" replaces="libreoffice"/>
<ignore name="libreoffice"/>
<package name="aaa_base" replaces="simple-scan"/>

6
pre-checkin.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
set -eu
set -u
install() {
if [ -n "${2-}" ]; then
@ -42,7 +42,8 @@ for distro in leap tumbleweed; do
fi
for flavor in gnome kde xfce x11; do
uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)"
[ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
uppercaseflavor="$(echo "${flavor}" | tr [:lower:] [:upper:])"
if [ "${flavor}" = "x11" ]; then
name="${distroname} Rescue CD"
@ -55,7 +56,6 @@ for distro in leap tumbleweed; do
PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->"
. "$PWD/list-${flavor}.sh"
[ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
sed "s#@FLAVOR@#${flavor}#g;\
s#@NAME@#${name// /-}#g;\
s#@DISPLAYNAME@#${name}#g;\