[-- Attachment #1: Type: text/plain, Size: 836 bytes --] There is a new pull request by dkwo against master on the void-packages repository https://github.com/dkwo/void-packages fwupd https://github.com/void-linux/void-packages/pull/32932 fwudp: change deps and config drop dep on udisks2, add dep on dbus drop -Dintrospection=true, which is default built and checked on x86_64-musl udisks2 brings in a lot of bloat, just to discover the ESP partition, but it actually does not do the job, so it would be simpler to just let the user take care of that. (That's also what Alpine does btw.) Notice even with udisks, I currently have to do `mount -t efivarfs efivarfs /sys/firmware/efi/efivars otherwise fwupd does not find the bios to update. Instead, dbus seems to be a needed dependency. A patch file from https://github.com/void-linux/void-packages/pull/32932.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fwupd-32932.patch --] [-- Type: text/x-diff, Size: 1426 bytes --] From 0cdfb26a496b3ac1e429e1c00d04475bc004aeef Mon Sep 17 00:00:00 2001 From: dkwo <nicolopiazzalunga@gmail.com> Date: Sat, 11 Sep 2021 16:54:11 +0200 Subject: [PATCH] fwudp: change deps and config drop dep on udisks2, add dep on dbus drop -Dintrospection=true, which is default --- srcpkgs/fwupd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index afe369923922..b8b703914737 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,11 +1,11 @@ # Template file for 'fwupd' pkgname=fwupd version=1.6.3 -revision=1 +revision=2 build_style=meson build_helper="gir" # tests require unpackaged umockdev -configure_args="-Dsupported_build=true -Dconsolekit=false -Dintrospection=true +configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Dplugin_altos=false -Delogind=true -Dtests=false" hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala glib-devel polkit gettext pango python3-gobject python3-Pillow" @@ -13,7 +13,7 @@ makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel sqlite-devel libsoup-devel gcab-devel pango-devel elogind-devel tpm2-tss-devel libjcat-devel libcurl-devel" -depends="udisks2" +depends="dbus" conf_files=" /etc/fwupd/*.conf /etc/fwupd/remotes.d/*.conf"
[-- Attachment #1: Type: text/plain, Size: 463 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-917466982 Comment: I think removing the configure arg is a bad idea. It might be default disabled later in life and we won't notice. I'm not sure how best to deal with udisks2, will look into how the whole thing works (but I think the commit message should mention the rationale, like you did in the PR body). And yeah, it def needs dbus.
[-- Attachment #1: Type: text/plain, Size: 840 bytes --] There is an updated pull request by dkwo against master on the void-packages repository https://github.com/dkwo/void-packages fwupd https://github.com/void-linux/void-packages/pull/32932 fwudp: change deps and config drop dep on udisks2, add dep on dbus drop -Dintrospection=true, which is default built and checked on x86_64-musl udisks2 brings in a lot of bloat, just to discover the ESP partition, but it actually does not do the job, so it would be simpler to just let the user take care of that. (That's also what Alpine does btw.) Notice even with udisks, I currently have to do `mount -t efivarfs efivarfs /sys/firmware/efi/efivars` otherwise fwupd does not find the bios to update. Instead, dbus seems to be a needed dependency. A patch file from https://github.com/void-linux/void-packages/pull/32932.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fwupd-32932.patch --] [-- Type: text/x-diff, Size: 1377 bytes --] From 6340a0cb500cb5b8fd51cbcec7026a5dd43be12c Mon Sep 17 00:00:00 2001 From: dkwo <nicolopiazzalunga@gmail.com> Date: Sun, 12 Sep 2021 08:27:30 +0200 Subject: [PATCH] fwupd: change deps udisks2 brings in a lot of bloat, just to discover the ESP partition, but it actually does not do the job, so it is simpler to let the user take care of that. (That's also what Alpine does btw.) Notice that even with udisks, I currently have to do `mount -t efivarfs efivarfs /sys/firmware/efi/efivars' otherwise fwupd does not find the bios to update. Instead, dbus seems to be a needed dependency. --- srcpkgs/fwupd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index afe369923922..ea1098368bef 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,7 +1,7 @@ # Template file for 'fwupd' pkgname=fwupd version=1.6.3 -revision=1 +revision=2 build_style=meson build_helper="gir" # tests require unpackaged umockdev @@ -13,7 +13,7 @@ makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel sqlite-devel libsoup-devel gcab-devel pango-devel elogind-devel tpm2-tss-devel libjcat-devel libcurl-devel" -depends="udisks2" +depends="dbus" conf_files=" /etc/fwupd/*.conf /etc/fwupd/remotes.d/*.conf"
[-- Attachment #1: Type: text/plain, Size: 246 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-919774944 Comment: Btw, I was advised from upstream to drop the `plugin_altos=false` option, is there any reason why we use it?
[-- Attachment #1: Type: text/plain, Size: 214 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-920504273 Comment: Sounds reasonable to me. It was disabled from the start, no clear reason.
[-- Attachment #1: Type: text/plain, Size: 829 bytes --] There is an updated pull request by dkwo against master on the void-packages repository https://github.com/dkwo/void-packages fwupd https://github.com/void-linux/void-packages/pull/32932 fwupd: change deps drop dep on udisks2, add dep on dbus drop -Dintrospection=true, which is default built and checked on x86_64-musl udisks2 brings in a lot of bloat, just to discover the ESP partition, but it actually does not do the job, so it would be simpler to just let the user take care of that. (That's also what Alpine does btw.) Notice even with udisks, I currently have to do `mount -t efivarfs efivarfs /sys/firmware/efi/efivars` otherwise fwupd does not find the bios to update. Instead, dbus seems to be a needed dependency. A patch file from https://github.com/void-linux/void-packages/pull/32932.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fwupd-32932.patch --] [-- Type: text/x-diff, Size: 1873 bytes --] From bda7934ac8f9600afd129cb6bcd7d674121ffb2b Mon Sep 17 00:00:00 2001 From: dkwo <nicolopiazzalunga@gmail.com> Date: Sun, 12 Sep 2021 08:27:30 +0200 Subject: [PATCH] fwupd: change deps, config udisks2 brings in a lot of bloat, just to discover the ESP partition, but it actually does not do the job, so it is simpler to let the user take care of that. (That's also what Alpine does btw.) Notice that even with udisks, I currently have to do `mount -t efivarfs efivarfs /sys/firmware/efi/efivars' otherwise fwupd does not find the bios to update. Instead, dbus seems to be a needed dependency. Also, drop the plugin_altos=false config option, as suggested from upstream. --- srcpkgs/fwupd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index afe369923922..427b4eed730e 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,19 +1,19 @@ # Template file for 'fwupd' pkgname=fwupd version=1.6.3 -revision=1 +revision=2 build_style=meson build_helper="gir" # tests require unpackaged umockdev -configure_args="-Dsupported_build=true -Dconsolekit=false -Dintrospection=true - -Dsystemd=false -Dplugin_altos=false -Delogind=true -Dtests=false" +configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true + -Dintrospection=true -Dtests=false" hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala glib-devel polkit gettext pango python3-gobject python3-Pillow" makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel sqlite-devel libsoup-devel gcab-devel pango-devel elogind-devel tpm2-tss-devel libjcat-devel libcurl-devel" -depends="udisks2" +depends="dbus" conf_files=" /etc/fwupd/*.conf /etc/fwupd/remotes.d/*.conf"
[-- Attachment #1: Type: text/plain, Size: 143 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-920838598 Comment: Done.
[-- Attachment #1: Type: text/plain, Size: 457 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-921159183 Comment: Do you have `elogind` installed? I think it mounts efivarfs for you. I definitely don't have custom mounts for it but it's mounted here. I'm pending towards leaving udisks2 in, can you list what dependencies it pulls in? If you could format the commit message so it isn't a block of text, that'd be helpful too :)
[-- Attachment #1: Type: text/plain, Size: 829 bytes --] There is an updated pull request by dkwo against master on the void-packages repository https://github.com/dkwo/void-packages fwupd https://github.com/void-linux/void-packages/pull/32932 fwupd: change deps drop dep on udisks2, add dep on dbus drop -Dintrospection=true, which is default built and checked on x86_64-musl udisks2 brings in a lot of bloat, just to discover the ESP partition, but it actually does not do the job, so it would be simpler to just let the user take care of that. (That's also what Alpine does btw.) Notice even with udisks, I currently have to do `mount -t efivarfs efivarfs /sys/firmware/efi/efivars` otherwise fwupd does not find the bios to update. Instead, dbus seems to be a needed dependency. A patch file from https://github.com/void-linux/void-packages/pull/32932.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fwupd-32932.patch --] [-- Type: text/x-diff, Size: 1587 bytes --] From 9aa1a36cc34faf501461c096070760655fb6177a Mon Sep 17 00:00:00 2001 From: dkwo <nicolopiazzalunga@gmail.com> Date: Sun, 12 Sep 2021 08:27:30 +0200 Subject: [PATCH] fwupd: change deps, config Drop dependency on udisks2, let user mount ESP. Otherwise, to work it would also require elogind. Add needed dbus dependency. Drop plugin_altos=false config option, as suggested by upstream. --- srcpkgs/fwupd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index afe369923922..427b4eed730e 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,19 +1,19 @@ # Template file for 'fwupd' pkgname=fwupd version=1.6.3 -revision=1 +revision=2 build_style=meson build_helper="gir" # tests require unpackaged umockdev -configure_args="-Dsupported_build=true -Dconsolekit=false -Dintrospection=true - -Dsystemd=false -Dplugin_altos=false -Delogind=true -Dtests=false" +configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true + -Dintrospection=true -Dtests=false" hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala glib-devel polkit gettext pango python3-gobject python3-Pillow" makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel sqlite-devel libsoup-devel gcab-devel pango-devel elogind-devel tpm2-tss-devel libjcat-devel libcurl-devel" -depends="udisks2" +depends="dbus" conf_files=" /etc/fwupd/*.conf /etc/fwupd/remotes.d/*.conf"
[-- Attachment #1: Type: text/plain, Size: 3106 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-921187413 Comment: I don't have `elogind`. This is without ``` $ xi fwupd Name Action Version New version Download size fwupd-efi install - 1.1_1 - json-glib install - 1.6.6_1 - libxmlb install - 0.2.1_1 - mbedtls install - 2.16.11_1 - tpm2-tss install - 3.0.3_1 - libassuan install - 2.5.5_1 - libgpgme install - 1.15.1_2 - libjcat install - 0.1.4_1 - libelogind install - 246.9.2_3 - mozjs78 install - 78.9.0_3 - polkit install - 0.118_2 - libsmbios install - 2.4.3_2 - gcab install - 1.4_2 - fwupd install - 1.6.3_2 - Size required on disk: 36MB ``` and this is with ``` $ xi fwupd Name Action Version New version Download size libelogind install - 246.9.2_3 - mozjs78 install - 78.9.0_3 - polkit install - 0.118_2 - libbytesize install - 2.6_1 - libyaml install - 0.2.5_1 - libdaxctl install - 70.1_1 - libndctl install - 70.1_1 - libassuan install - 2.5.5_1 - libgpgme install - 1.15.1_2 - volume_key install - 0.3.12_4 - libparted install - 3.3_1 - dmraid install - 1.0.0.rc16.3_12 - libblockdev install - 2.25_1 - libatasmart install - 0.19_5 - udisks2 install - 2.9.2_1 - fwupd-efi install - 1.1_1 - json-glib install - 1.6.6_1 - libxmlb install - 0.2.1_1 - mbedtls install - 2.16.11_1 - tpm2-tss install - 3.0.3_1 - libjcat install - 0.1.4_1 - gcab install - 1.4_2 - libsmbios install - 2.4.3_2 - fwupd install - 1.6.3_1 - Size required on disk: 42MB ``` I formatted the message. I still argue that it's better to not require `udisks2`, `elogind`, etc. and just let the user mount the ESP.
[-- Attachment #1: Type: text/plain, Size: 829 bytes --] There is an updated pull request by dkwo against master on the void-packages repository https://github.com/dkwo/void-packages fwupd https://github.com/void-linux/void-packages/pull/32932 fwupd: change deps drop dep on udisks2, add dep on dbus drop -Dintrospection=true, which is default built and checked on x86_64-musl udisks2 brings in a lot of bloat, just to discover the ESP partition, but it actually does not do the job, so it would be simpler to just let the user take care of that. (That's also what Alpine does btw.) Notice even with udisks, I currently have to do `mount -t efivarfs efivarfs /sys/firmware/efi/efivars` otherwise fwupd does not find the bios to update. Instead, dbus seems to be a needed dependency. A patch file from https://github.com/void-linux/void-packages/pull/32932.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fwupd-32932.patch --] [-- Type: text/x-diff, Size: 1471 bytes --] From 5f4168f75f15c9dde0f7037c67f703567125f517 Mon Sep 17 00:00:00 2001 From: dkwo <nicolopiazzalunga@gmail.com> Date: Sun, 12 Sep 2021 08:27:30 +0200 Subject: [PATCH] fwupd: add deps, edit config Drop plugin_altos=false config option, as suggested by upstream. --- srcpkgs/fwupd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index 388e46127502..2205b555154b 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,19 +1,19 @@ # Template file for 'fwupd' pkgname=fwupd version=1.6.4 -revision=1 +revision=2 build_style=meson build_helper="gir" +configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true + -Dintrospection=true -Dtests=false" # tests require unpackaged umockdev -configure_args="-Dsupported_build=true -Dconsolekit=false -Dintrospection=true - -Dsystemd=false -Dplugin_altos=false -Delogind=true -Dtests=false" hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala glib-devel polkit gettext pango python3-gobject python3-Pillow" makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel sqlite-devel libsoup-devel gcab-devel pango-devel elogind-devel tpm2-tss-devel libjcat-devel libcurl-devel" -depends="udisks2" +depends="dbus udisks2" conf_files=" /etc/fwupd/*.conf /etc/fwupd/remotes.d/*.conf"
[-- Attachment #1: Type: text/plain, Size: 172 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-937576437 Comment: Rebased it, and kept both depends.
[-- Attachment #1: Type: text/plain, Size: 207 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-964102703 Comment: @ericonr This is now a minimal change, do you think it can be merged?
[-- Attachment #1: Type: text/plain, Size: 681 bytes --] There's a merged pull request on the void-packages repository fwupd: change deps https://github.com/void-linux/void-packages/pull/32932 Description: drop dep on udisks2, add dep on dbus drop -Dintrospection=true, which is default built and checked on x86_64-musl udisks2 brings in a lot of bloat, just to discover the ESP partition, but it actually does not do the job, so it would be simpler to just let the user take care of that. (That's also what Alpine does btw.) Notice even with udisks, I currently have to do `mount -t efivarfs efivarfs /sys/firmware/efi/efivars` otherwise fwupd does not find the bios to update. Instead, dbus seems to be a needed dependency.
[-- Attachment #1: Type: text/plain, Size: 291 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-964475283 Comment: If fwupd didn't already drag in polkit, I think it would have been a better case for removing udisks2. As is, it's kinda bloated by default already :/
[-- Attachment #1: Type: text/plain, Size: 150 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/32932#issuecomment-964914370 Comment: Makes sense.