1
0

Accepting request 1094664 from home:favogt:branches:openSUSE:Factory:Live

- livecd.kiwi.in, list-common.sh: Make use of patterns-base-bootloader and
  drop redundant package inclusions. This also adds mokutil (boo#1209985).
- Drop gfxboot, kiwi uses grub2 on ix86 for some time now

OBS-URL: https://build.opensuse.org/request/show/1094664
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=149
This commit is contained in:
Fabian Vogt 2023-06-22 13:01:13 +00:00 committed by Git OBS Bridge
parent 3e5ea36c74
commit db9e342a81
12 changed files with 46 additions and 54 deletions

View File

@ -53,8 +53,6 @@ buildignore inxi
buildignore sane-backends
install branding-openSUSE
install gfxboot i686
install shim x86_64
# Don't pull in any -32bit libs
buildignore glibc-32bit
@ -119,6 +117,7 @@ buildignore pam_kwallet
buildignore apparmor-docs
buildignore mutt-doc
buildignore coreutils-doc
# Do not buildignore here. Needed by pidgin in Xfce Live CD.
# buildignore cyrus-sasl

View File

@ -46,6 +46,7 @@ buildignore gnome-software
# Pulls in color management tools
buildignore gnome-control-center-color
buildignore gnome-control-center-user-faces
# 17 MiB, really?
buildignore libgweather-lang

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>
@ -163,8 +160,6 @@
<package name="aaa_base" replaces="sane-backends"/>
<ignore name="sane-backends"/>
<package name="branding-openSUSE"/>
<package name="gfxboot" arch="i686"/>
<package name="shim" arch="x86_64"/>
<package name="aaa_base" replaces="glibc-32bit"/>
<ignore name="glibc-32bit"/>
<package name="aaa_base" replaces="libvdpau_r300"/>
@ -243,6 +238,8 @@
<ignore name="apparmor-docs"/>
<package name="aaa_base" replaces="mutt-doc"/>
<ignore name="mutt-doc"/>
<package name="aaa_base" replaces="coreutils-doc"/>
<ignore name="coreutils-doc"/>
<package name="aaa_base" replaces="unar"/>
<ignore name="unar"/>
<package name="aaa_base" replaces="jing"/>
@ -527,6 +524,8 @@
<ignore name="gnome-software"/>
<package name="aaa_base" replaces="gnome-control-center-color"/>
<ignore name="gnome-control-center-color"/>
<package name="aaa_base" replaces="gnome-control-center-user-faces"/>
<ignore name="gnome-control-center-user-faces"/>
<package name="aaa_base" replaces="libgweather-lang"/>
<ignore name="libgweather-lang"/>
<package name="aaa_base" replaces="gnome-user-docs"/>

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>
@ -163,8 +160,6 @@
<package name="aaa_base" replaces="sane-backends"/>
<ignore name="sane-backends"/>
<package name="branding-openSUSE"/>
<package name="gfxboot" arch="i686"/>
<package name="shim" arch="x86_64"/>
<package name="aaa_base" replaces="glibc-32bit"/>
<ignore name="glibc-32bit"/>
<package name="aaa_base" replaces="libvdpau_r300"/>
@ -243,6 +238,8 @@
<ignore name="apparmor-docs"/>
<package name="aaa_base" replaces="mutt-doc"/>
<ignore name="mutt-doc"/>
<package name="aaa_base" replaces="coreutils-doc"/>
<ignore name="coreutils-doc"/>
<package name="aaa_base" replaces="unar"/>
<ignore name="unar"/>
<package name="aaa_base" replaces="jing"/>

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>
@ -163,8 +160,6 @@
<package name="aaa_base" replaces="sane-backends"/>
<ignore name="sane-backends"/>
<package name="branding-openSUSE"/>
<package name="gfxboot" arch="i686"/>
<package name="shim" arch="x86_64"/>
<package name="aaa_base" replaces="glibc-32bit"/>
<ignore name="glibc-32bit"/>
<package name="aaa_base" replaces="libvdpau_r300"/>
@ -243,6 +238,8 @@
<ignore name="apparmor-docs"/>
<package name="aaa_base" replaces="mutt-doc"/>
<ignore name="mutt-doc"/>
<package name="aaa_base" replaces="coreutils-doc"/>
<ignore name="coreutils-doc"/>
<package name="aaa_base" replaces="unar"/>
<ignore name="unar"/>
<package name="aaa_base" replaces="jing"/>

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>
@ -163,8 +160,6 @@
<package name="aaa_base" replaces="sane-backends"/>
<ignore name="sane-backends"/>
<package name="branding-openSUSE"/>
<package name="gfxboot" arch="i686"/>
<package name="shim" arch="x86_64"/>
<package name="aaa_base" replaces="glibc-32bit"/>
<ignore name="glibc-32bit"/>
<package name="aaa_base" replaces="libvdpau_r300"/>
@ -243,6 +238,8 @@
<ignore name="apparmor-docs"/>
<package name="aaa_base" replaces="mutt-doc"/>
<ignore name="mutt-doc"/>
<package name="aaa_base" replaces="coreutils-doc"/>
<ignore name="coreutils-doc"/>
<package name="aaa_base" replaces="unar"/>
<ignore name="unar"/>
<package name="aaa_base" replaces="jing"/>

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Jun 22 12:05:26 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- livecd.kiwi.in, list-common.sh: Make use of patterns-base-bootloader and
drop redundant package inclusions. This also adds mokutil (boo#1209985).
- Drop gfxboot, kiwi uses grub2 on ix86 for some time now
-------------------------------------------------------------------
Thu Jun 22 06:14:21 UTC 2023 - Dominique Leuenberger <dleuenberger@suse.com>
- list-gnome.sh: ignore gnome-control-center-user-faces: gain some
space; user generation on the live system is not relevant.
- list-common.sh: drop coreutils-doc: a little bit more space for
all.
-------------------------------------------------------------------
Wed Apr 12 12:02:26 UTC 2023 - Fabian Vogt <fvogt@suse.com>

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>
@ -163,8 +160,6 @@
<package name="aaa_base" replaces="sane-backends"/>
<ignore name="sane-backends"/>
<package name="branding-openSUSE"/>
<package name="gfxboot" arch="i686"/>
<package name="shim" arch="x86_64"/>
<package name="aaa_base" replaces="glibc-32bit"/>
<ignore name="glibc-32bit"/>
<package name="aaa_base" replaces="libvdpau_r300"/>
@ -243,6 +238,8 @@
<ignore name="apparmor-docs"/>
<package name="aaa_base" replaces="mutt-doc"/>
<ignore name="mutt-doc"/>
<package name="aaa_base" replaces="coreutils-doc"/>
<ignore name="coreutils-doc"/>
<package name="aaa_base" replaces="unar"/>
<ignore name="unar"/>
<package name="aaa_base" replaces="jing"/>
@ -518,6 +515,8 @@
<ignore name="gnome-software"/>
<package name="aaa_base" replaces="gnome-control-center-color"/>
<ignore name="gnome-control-center-color"/>
<package name="aaa_base" replaces="gnome-control-center-user-faces"/>
<ignore name="gnome-control-center-user-faces"/>
<package name="aaa_base" replaces="libgweather-lang"/>
<ignore name="libgweather-lang"/>
<package name="aaa_base" replaces="gnome-user-docs"/>

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>
@ -163,8 +160,6 @@
<package name="aaa_base" replaces="sane-backends"/>
<ignore name="sane-backends"/>
<package name="branding-openSUSE"/>
<package name="gfxboot" arch="i686"/>
<package name="shim" arch="x86_64"/>
<package name="aaa_base" replaces="glibc-32bit"/>
<ignore name="glibc-32bit"/>
<package name="aaa_base" replaces="libvdpau_r300"/>
@ -243,6 +238,8 @@
<ignore name="apparmor-docs"/>
<package name="aaa_base" replaces="mutt-doc"/>
<ignore name="mutt-doc"/>
<package name="aaa_base" replaces="coreutils-doc"/>
<ignore name="coreutils-doc"/>
<package name="aaa_base" replaces="unar"/>
<ignore name="unar"/>
<package name="aaa_base" replaces="jing"/>

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>
@ -163,8 +160,6 @@
<package name="aaa_base" replaces="sane-backends"/>
<ignore name="sane-backends"/>
<package name="branding-openSUSE"/>
<package name="gfxboot" arch="i686"/>
<package name="shim" arch="x86_64"/>
<package name="aaa_base" replaces="glibc-32bit"/>
<ignore name="glibc-32bit"/>
<package name="aaa_base" replaces="libvdpau_r300"/>
@ -243,6 +238,8 @@
<ignore name="apparmor-docs"/>
<package name="aaa_base" replaces="mutt-doc"/>
<ignore name="mutt-doc"/>
<package name="aaa_base" replaces="coreutils-doc"/>
<ignore name="coreutils-doc"/>
<package name="aaa_base" replaces="unar"/>
<ignore name="unar"/>
<package name="aaa_base" replaces="jing"/>

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>
@ -163,8 +160,6 @@
<package name="aaa_base" replaces="sane-backends"/>
<ignore name="sane-backends"/>
<package name="branding-openSUSE"/>
<package name="gfxboot" arch="i686"/>
<package name="shim" arch="x86_64"/>
<package name="aaa_base" replaces="glibc-32bit"/>
<ignore name="glibc-32bit"/>
<package name="aaa_base" replaces="libvdpau_r300"/>
@ -243,6 +238,8 @@
<ignore name="apparmor-docs"/>
<package name="aaa_base" replaces="mutt-doc"/>
<ignore name="mutt-doc"/>
<package name="aaa_base" replaces="coreutils-doc"/>
<ignore name="coreutils-doc"/>
<package name="aaa_base" replaces="unar"/>
<ignore name="unar"/>
<package name="aaa_base" replaces="jing"/>

View File

@ -37,8 +37,7 @@
</users>
<packages type="image" patternType="plusRecommended">
<package name="kernel-default"/>
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<package name="patterns-base-bootloader"/>
<package name="dracut-kiwi-live"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
@ -49,8 +48,6 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
<package name="memtest86+" arch="i686,x86_64"/>
<package name="live-langset-data"/>
<package name="live-add-yast-repos"/>