From a24dfd663921405640cc98d3b25af2ced655fa52a49ff87fd5247c05a1041361 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 14 Nov 2018 15:42:55 +0000 Subject: [PATCH] - Install README.BETA from skelcd-openSUSE OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=4 --- config.sh | 4 ++++ list-gnome.sh | 1 + list-kde.sh | 1 + livecd-leap-gnome.kiwi | 1 + livecd-leap-kde.kiwi | 1 + livecd-openSUSE.changes | 5 +++++ livecd-tumbleweed-gnome.kiwi | 1 + livecd-tumbleweed-kde.kiwi | 1 + 8 files changed, 15 insertions(+) diff --git a/config.sh b/config.sh index 3231c84..7f96101 100644 --- a/config.sh +++ b/config.sh @@ -72,6 +72,10 @@ rm -rf /lib/firmware/{liquidio,netronome} add-yast-repos zypper --non-interactive rm -u live-add-yast-repos +# Install README.BETA where expected by YaST +cp /usr/lib/skelcd/CD1/README.BETA / || : +zypper --non-interactive rm -u skelcd-openSUSE || : + # Remove the zypper locks needed for a slimmer system zypper rl $(seq 1 $(zypper ll | wc -l)) diff --git a/list-gnome.sh b/list-gnome.sh index 8723f7c..1e3a344 100644 --- a/list-gnome.sh +++ b/list-gnome.sh @@ -22,6 +22,7 @@ buildignore noto-sans-fonts install libreoffice-writer install live-net-installer +install skelcd-openSUSE # Needed for README.BETA install setxkbmap # Needed by yast2-keyboard install yast2-qt-branding-openSUSE diff --git a/list-kde.sh b/list-kde.sh index 36819c6..cf091bf 100644 --- a/list-kde.sh +++ b/list-kde.sh @@ -32,6 +32,7 @@ buildignore kdenetwork4-filesharing buildignore gnome-keyring buildignore k3b install live-net-installer +install skelcd-openSUSE # Needed for README.BETA install setxkbmap # Needed by yast2-keyboard install yast2-qt-branding-openSUSE buildignore oxygen5-icon-theme-large diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 1c6352b..da8fe8c 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -320,6 +320,7 @@ + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index bb10b48..6f8379f 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -348,6 +348,7 @@ + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 28719b8..38337d0 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -4,6 +4,11 @@ Wed Nov 7 12:49:31 UTC 2018 - Fabian Vogt - Add livecd-openSUSE.kiwi to allow submission as "livecd-openSUSE" into the main project +------------------------------------------------------------------- +Mon Nov 5 15:13:45 UTC 2018 - Fabian Vogt + +- Install README.BETA from skelcd-openSUSE + ------------------------------------------------------------------- Mon Nov 5 12:14:37 UTC 2018 - Fabian Vogt diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 7295f22..bb0a4bd 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -320,6 +320,7 @@ + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 722f8fd..de68684 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -348,6 +348,7 @@ +