PR#189: General comps sync & exclude for gstreamer1-plugin-openh264 - workstation-ostree-config

workstation-ostree-config

#189 General comps sync & exclude for gstreamer1-plugin-openh264

Merged 3 years ago by kalev. Opened 3 years ago by siosm.

siosm/workstation-ostree-config main into main

comps-sync rawhide 2021-02-02

Timothée Ravier • 3 years ago

f554d5f

Make sure all openh264 packages are always excluded

Timothée Ravier • 3 years ago

110d929

comps-sync-exclude-list: Exclude okular & elisa for Kinoite

Timothée Ravier • 3 years ago

9baf4ba

comps-sync-exclude-list.yml

file modified

		`@@ -14,8 +14,12 @@`
		`- container-management`

		`# PackageKit is spread across various groups`
		`+ # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264`
		`exclude_list_all_regexp:`
		`- "PackageKit.*"`
		`+ - "gstreamer1-plugin-openh264"`
		`+ - "mozilla-openh264"`
		`+ - "openh264"`

		`# Common exclude list for all ostree desktop versions`
		`exclude_list:`
		`@@ -169,6 +173,7 @@`
		`# Non-critical apps -> Flatpak`
		`- akregator`
		`- cagibi`
		`+ - elisa-player`
		`- gwenview`
		`- kaddressbook`
		`- kamera`
		`@@ -191,6 +196,7 @@`
		`- ksshaskpass`
		`- kwrite`
		`- libreoffice-kde`
		`+ - okular`
		`- spectacle`
		`# Misc`
		`- adwaita-gtk2-theme`

fedora-common-ostree-pkgs.yaml

file modified

+5 -8

		`@@ -9,7 +9,6 @@`
		`- abattis-cantarell-fonts`
		`- acl`
		`- adwaita-qt5`
		`- - alsa-plugins-pulseaudio`
		`- alsa-sof-firmware`
		`- alsa-ucm`
		`- alsa-utils`
		`@@ -67,6 +66,7 @@`
		`- google-noto-sans-sinhala-vf-fonts`
		`- gstreamer1-plugins-bad-free`
		`- gstreamer1-plugins-good`
		`+ - gstreamer1-plugins-ugly-free`
		`- gutenprint`
		`- gutenprint-cups`
		`- hostname`
		`@@ -78,7 +78,6 @@`
		`- ibus-libpinyin`
		`- ibus-libzhuyin`
		`- ibus-m17n`
		`- - ibus-qt`
		`- ibus-typing-booster`
		`- iproute`
		`- iptables`
		`@@ -151,6 +150,10 @@`
		`- passwdqc`
		`- pciutils`
		`- pinfo`
		`+ - pipewire-alsa`
		`+ - pipewire-gstreamer`
		`+ - pipewire-pulseaudio`
		`+ - pipewire-utils`
		`- plymouth`
		`- plymouth-system-theme`
		`- policycoreutils`
		`@@ -158,13 +161,7 @@`
		`- procps-ng`
		`- psmisc`
		`- pt-sans-fonts`
		`- - pulseaudio`
		`- - pulseaudio-module-x11`
		`- - pulseaudio-utils`
		`- qemu-guest-agent`
		`- - qt`
		`- - qt-settings`
		`- - qt-x11`
		`- qt5-qtbase`
		`- qt5-qtbase-gui`
		`- qt5-qtdeclarative`

fedora-common-ostree.yaml

file modified

		`@@ -88,3 +88,7 @@`
		`# Make sure the following are not pulled in when Recommended by other packages`
		`exclude-packages:`
		`- PackageKit`
		`+ # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264`
		`+ - gstreamer1-plugin-openh264`
		`+ - mozilla-openh264`
		`+ - openh264`

gnome-desktop-pkgs.yaml

file modified

-1

		`@@ -47,7 +47,6 @@`
		`- gvfs-gphoto2`
		`- gvfs-mtp`
		`- gvfs-smb`
		`- - libcanberra-gtk2`
		`- libcanberra-gtk3`
		`- libproxy-webkitgtk4`
		`- librsvg2`

mate-desktop-pkgs.yaml

file modified

+2 -1

		`@@ -9,7 +9,6 @@`
		`- NetworkManager-ssh-gnome`
		`- NetworkManager-vpnc-gnome`
		`- NetworkManager-wwan`
		`- - alsa-plugins-pulseaudio`
		`- atril`
		`- atril-caja`
		`- atril-thumbnailer`
		`@@ -83,6 +82,8 @@`
		`- orca`
		`- parole`
		`- pavucontrol`
		`+ - pipewire-alsa`
		`+ - pipewire-pulseaudio`
		`- pluma`
		`- seahorse`
		`- seahorse-caja`

siosm commented 3 years ago

According to https://fedoraproject.org/wiki/OpenH264, we can not ship gstreamer1-plugin-openh264 in Silverblue as the package as to be delivered from the Cisco infrastructure for the licensing exception to apply.

kalev commented 3 years ago

I don't think gstreamer1-plugin-openh264 ended up in the ostree image anyway when building in Fedora infra, but it doesn't hurt excluding it I guess. If you want to exclude it, can you also exclude 'mozilla-openh264' as it's pulled in as a soft dep by firefox? And maybe also 'openh264' as it's the actual library package that includes the openh264 codec?

Otherwise looks good to me! Thanks!

siosm commented 3 years ago

I don't think gstreamer1-plugin-openh264 ended up in the ostree image anyway when building in Fedora infra, but it doesn't hurt excluding it I guess.

This would have been included explicitly if not excluded with the latest comps sync for rawhide.

If you want to exclude it, can you also exclude 'mozilla-openh264' as it's pulled in as a soft dep by firefox? And maybe also 'openh264' as it's the actual library package that includes the openh264 codec?

Good catch. I will add that.

4 new commits added

comps-sync rawhide 2021-02-02
fedora-common-ostree: Make sure openh264 packages are always excluded
comps-sync-exclude-list: Exclude gstreamer1-plugin-openh264
comps-sync-exclude-list: Exclude okular & elisa for Kinoite

3 years ago

siosm commented 3 years ago

Updated. But I did not build this change so we might want to hold on while I do that.

Edited 3 years ago by siosm

kalev commented 3 years ago

Thanks!

I'm still a bit confused why comps-sync-exclude-list.yml has only gstreamer1-plugin-openh264, but fedora-common-ostree.yaml lists all of gstreamer1-plugin-openh264, mozilla-openh264, openh264 in exclude-packages. Shouldn't the excludes be the same in both files? Are they even needed in both places? :)

3 new commits added

comps-sync rawhide 2021-02-02
Make sure all openh264 packages are always excluded
comps-sync-exclude-list: Exclude okular & elisa for Kinoite

3 years ago

siosm commented 3 years ago

So for the first list in comps-sync-exclude-list.yml, I initially listed only the packages needed to be excluded from the imports we make via the comps-sync script. As the other packages are not mentioned in the comps, they don't really need to be listed but it is safe anyway.

The second exclude is a build time exclude for rpm-ostree in case some package has one of those as a recommend or hard dependency. It will fail the build if those packages have to be pulled or are part of the manifest.

So we need both. The first one to not have rpm-ostree include them willingly and the second one via dependencies.

I have updated the change to make this clearer and have both exclude lists include all the packages.

siosm commented 3 years ago

This also switches Rawhide to pipewire by default for Silverblue :)

kalev commented 3 years ago

Ahh, yes, I didn't realize someone had added gstreamer1-plugin-openh264 to comps. Makes sense to me now! Thanks :)