From b536620fbf5576e4a7b744c28ccb7d6a8fe97cffc5722cd14399784525aa4bee Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 26 Apr 2021 11:13:51 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/livecd-openSUSE revision 149.0 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=deec8ebbf59cd9ab56a90d2bf52ba396 --- list-common.sh | 2 +- livecd-leap-gnome.kiwi | 4 ++-- livecd-leap-kde.kiwi | 4 ++-- livecd-leap-x11.kiwi | 4 ++-- livecd-leap-xfce.kiwi | 4 ++-- livecd-openSUSE.changes | 6 ++++++ livecd-tumbleweed-gnome.kiwi | 4 ++-- livecd-tumbleweed-kde.kiwi | 4 ++-- livecd-tumbleweed-x11.kiwi | 4 ++-- livecd-tumbleweed-xfce.kiwi | 4 ++-- livecd.kiwi.in | 2 +- 11 files changed, 24 insertions(+), 18 deletions(-) diff --git a/list-common.sh b/list-common.sh index 4343489..333c319 100644 --- a/list-common.sh +++ b/list-common.sh @@ -53,7 +53,7 @@ buildignore inxi buildignore sane-backends install branding-openSUSE -install gfxboot i686,x86_64 +install gfxboot i686 install shim x86_64 # Don't pull in any -32bit libs diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index b371b40..568c84a 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -37,7 +37,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 05de602..2a7a0bb 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -37,7 +37,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 5edc2ed..5899874 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -37,7 +37,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index 4fdaeca..5f98796 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -37,7 +37,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 0cd15cb..b9f2ebb 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 26 11:12:14 UTC 2021 - Dominique Leuenberger + +- Limit gfxboot to i686 only: on x86_64, we have been using grub2 + to boot for quite a while already. + ------------------------------------------------------------------- Thu Apr 22 09:53:03 UTC 2021 - Fabian Vogt diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index e307242..df37809 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -37,7 +37,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index c193496..50a34b7 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -37,7 +37,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index e54fa53..8dc4963 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -37,7 +37,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index edb47bc..eab8de1 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -37,7 +37,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/livecd.kiwi.in b/livecd.kiwi.in index 2c52559..324c1e4 100644 --- a/livecd.kiwi.in +++ b/livecd.kiwi.in @@ -37,7 +37,7 @@ - + From 0a3e3621b7f365235b009b2a3dc36d24a0a1964983c31e8ac49d966e140e9531 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 26 Apr 2021 11:52:18 +0000 Subject: [PATCH 2/2] Accepting request 888471 from home:favogt:branches:openSUSE:Factory:Live - list-common: Ignore spax and tigervnc OBS-URL: https://build.opensuse.org/request/show/888471 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=103 --- list-common.sh | 10 +++++++++- livecd-leap-gnome.kiwi | 4 ++++ livecd-leap-kde.kiwi | 4 ++++ livecd-leap-x11.kiwi | 4 ++++ livecd-leap-xfce.kiwi | 4 ++++ livecd-openSUSE.changes | 5 +++++ livecd-tumbleweed-gnome.kiwi | 4 ++++ livecd-tumbleweed-kde.kiwi | 4 ++++ livecd-tumbleweed-x11.kiwi | 4 ++++ livecd-tumbleweed-xfce.kiwi | 4 ++++ 10 files changed, 46 insertions(+), 1 deletion(-) diff --git a/list-common.sh b/list-common.sh index 333c319..cba16cd 100644 --- a/list-common.sh +++ b/list-common.sh @@ -53,7 +53,7 @@ buildignore inxi buildignore sane-backends install branding-openSUSE -install gfxboot i686 +install gfxboot i686 install shim x86_64 # Don't pull in any -32bit libs @@ -123,6 +123,9 @@ buildignore jing # Won't work with current firefox anyway buildignore icedtea-web +# Recommended by base_x11 +buildignore tigervnc + # Recommended by enhanced_base buildignore autofs buildignore expect @@ -130,6 +133,7 @@ buildignore m4 buildignore mutt buildignore net-snmp buildignore recode +buildignore spax # Recommended by rest_cd_core buildignore awesfx @@ -172,6 +176,10 @@ buildignore man-pages buildignore NetworkManager-vpnc-gnome buildignore plasma-nm5-vpnc +# We have NetworkManager instead. +# Valid only after removal of "Requires: /sbin/ifup" in sysconfig.spec +# buildignore wicked + # Conflicts with rsyslog otherwise buildignore systemd-logger diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 568c84a..0ec3d15 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -240,6 +240,8 @@ + + @@ -252,6 +254,8 @@ + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 2a7a0bb..a18abfa 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -240,6 +240,8 @@ + + @@ -252,6 +254,8 @@ + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 5899874..5a3d070 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -240,6 +240,8 @@ + + @@ -252,6 +254,8 @@ + + diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi index 5f98796..5391d19 100644 --- a/livecd-leap-xfce.kiwi +++ b/livecd-leap-xfce.kiwi @@ -240,6 +240,8 @@ + + @@ -252,6 +254,8 @@ + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index b9f2ebb..5c74c67 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 26 11:16:03 UTC 2021 - Fabian Vogt + +- list-common: Ignore spax and tigervnc + ------------------------------------------------------------------- Mon Apr 26 11:12:14 UTC 2021 - Dominique Leuenberger diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index df37809..648e0ed 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -240,6 +240,8 @@ + + @@ -252,6 +254,8 @@ + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 50a34b7..576e16f 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -240,6 +240,8 @@ + + @@ -252,6 +254,8 @@ + + diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 8dc4963..7084678 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -240,6 +240,8 @@ + + @@ -252,6 +254,8 @@ + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index eab8de1..33ec99e 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -240,6 +240,8 @@ + + @@ -252,6 +254,8 @@ + +