* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2017-05-24 12:55 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2017-05-24 12:55 UTC (permalink / raw
To: gentoo-commits
commit: 4e0151d9ff78bcb9d5b3ccf9b9bfb8217e60be0f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 12:54:42 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 24 12:54:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e0151d9
sys-apps/fwupd: Initial commit.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sys-apps/fwupd/Manifest | 2 +
.../fwupd/files/fwupd-0.9-polkit_its_files.patch | 65 ++++++++++++++++++
sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch | 77 ++++++++++++++++++++++
sys-apps/fwupd/fwupd-0.8.0.ebuild | 74 +++++++++++++++++++++
sys-apps/fwupd/fwupd-0.9.2.ebuild | 65 ++++++++++++++++++
sys-apps/fwupd/metadata.xml | 19 ++++++
6 files changed, 302 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
new file mode 100644
index 00000000000..c5df856f488
--- /dev/null
+++ b/sys-apps/fwupd/Manifest
@@ -0,0 +1,2 @@
+DIST fwupd-0.8.0.tar.gz 1296361 SHA256 b9c7550778747a2c47270ae518c65ab1111f749bbbd8f058ed7177201b414c10 SHA512 76c52a6902a6a4d651ad8e3694edf9d21320197baa7faf84fe1d4809e8e5990db43ae949a90bd72df6110d0df77f5181bd425a846c22f5ef749b9b6dac045bf8 WHIRLPOOL e7bdbd74f500257cf674cf7131c90e345dc7e2596ae14bbc3b11ff236ce633bb104ed7237fab974cc7c5c6edebcbe678816e8653dc04370614a1c54d0cb5b977
+DIST fwupd-0.9.2.tar.gz 1313712 SHA256 a5a7a9886b0efbea57cbcbc841923a9272e4f26dd8658a8e1a90f6eec371cce1 SHA512 14dd3e7ee34f2bda0ed03d141715166ba7b4e69443f2ffd056e17a834d42ef8caa56d729b273e3890936c9b768c10ee6fbcf0d7e7d336c957901b93832ffe9c2 WHIRLPOOL 305e84be8c12a8f4da7897f7bb8c5599a608de315c90c5399c05637c65667f83e7187d851156643ebec7e402f3aecab320f02f4c2c1b69554b20561ce2a08b64
diff --git a/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch b/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch
new file mode 100644
index 00000000000..999df1cba25
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch
@@ -0,0 +1,65 @@
+From 797e5672e64acd4f90cd52afca3bb192b28b4636 Mon Sep 17 00:00:00 2001
+From: Julian Liu <liu.julian@gmail.com>
+Date: Fri, 28 Apr 2017 18:09:20 +0800
+Subject: [PATCH] Add polkit's ITS files as Ubuntu doesn't not ship with it.
+
+Call msgfmt with custom_target for now as data_dir kargs for i18n.merge_file() not merged into master yet.
+(https://github.com/mesonbuild/meson/issues/1565)
+---
+ its/polkit.its | 8 ++++++++
+ its/polkit.loc | 6 ++++++
+ policy/meson.build | 12 ++++++++----
+ 3 files changed, 22 insertions(+), 4 deletions(-)
+ create mode 100644 its/polkit.its
+ create mode 100644 its/polkit.loc
+
+diff --git a/its/polkit.its b/its/polkit.its
+new file mode 100644
+index 0000000..1c37e6b
+--- /dev/null
++++ b/its/polkit.its
+@@ -0,0 +1,8 @@
++<?xml version="1.0"?>
++<its:rules xmlns:its="http://www.w3.org/2005/11/its"
++ version="2.0">
++ <its:translateRule selector="//*" translate="no"/>
++ <its:translateRule selector="//action/description |
++ //action/message"
++ translate="yes"/>
++</its:rules>
+diff --git a/its/polkit.loc b/its/polkit.loc
+new file mode 100644
+index 0000000..c7427ec
+--- /dev/null
++++ b/its/polkit.loc
+@@ -0,0 +1,6 @@
++<?xml version="1.0"?>
++<locatingRules>
++ <locatingRule name="polkit policy" pattern="*.policy">
++ <documentRule localName="policyconfig" target="polkit.its"/>
++ </locatingRule>
++</locatingRules>
+diff --git a/policy/meson.build b/policy/meson.build
+index def8976..41da2db 100644
+--- a/policy/meson.build
++++ b/policy/meson.build
+@@ -1,11 +1,15 @@
+ install_data('org.freedesktop.fwupd.rules',
+ install_dir : 'share/polkit-1/rules.d')
+
+-i18n.merge_file(
+- input: 'org.freedesktop.fwupd.policy.in',
++envbin = find_program('env')
++gettext_data_dir = 'GETTEXTDATADIRS=' + meson.source_root()
++custom_target('org.freedesktop.fwupd.policy',
+ output: 'org.freedesktop.fwupd.policy',
+- type: 'xml',
+- po_dir: join_paths(meson.source_root(), 'po'),
++ input: 'org.freedesktop.fwupd.policy.in',
++ command: [envbin, gettext_data_dir, 'msgfmt', '--xml',
++ '--template', '@INPUT@',
++ '-d', join_paths(meson.source_root(), 'po'),
++ '-o', '@OUTPUT@'],
+ install: true,
+ install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions')
+ )
diff --git a/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch b/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch
new file mode 100644
index 00000000000..354b5e5800e
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch
@@ -0,0 +1,77 @@
+--- fwupd-0.9.2/data/meson.build
++++ fwupd-0.9.2/data/meson.build
+@@ -38,20 +38,22 @@
+ 'system-services'),
+ )
+
+-# replace @bindir@
+-configure_file(
+- input : 'fwupd-offline-update.service.in',
+- output : 'fwupd-offline-update.service',
+- configuration : con2,
+- install: true,
+- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
+-)
++if get_option('with-systemd') and systemd.found()
++ # replace @bindir@
++ configure_file(
++ input : 'fwupd-offline-update.service.in',
++ output : 'fwupd-offline-update.service',
++ configuration : con2,
++ install: true,
++ install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
++ )
+
+-# replace @localstatedir@ and @bootdir@
+-configure_file(
+- input : 'fwupd.service.in',
+- output : 'fwupd.service',
+- configuration : con2,
+- install: true,
+- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
+-)
++ # replace @localstatedir@ and @bootdir@
++ configure_file(
++ input : 'fwupd.service.in',
++ output : 'fwupd.service',
++ configuration : con2,
++ install: true,
++ install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
++ )
++endif
+--- fwupd-0.9.2/meson.build
++++ fwupd-0.9.2/meson.build
+@@ -127,13 +127,17 @@
+ gpgme = cc.find_library('gpgme')
+ gpgerror = cc.find_library('libgpg-error')
+ libm = cc.find_library('libm', required: false)
+-systemd = dependency('systemd')
+ udev = dependency('udev')
+
+ if valgrind.found()
+ conf.set('HAVE_VALGRIND', '1')
+ endif
+
++if get_option('with-systemd')
++ systemd = dependency('systemd')
++ conf.set('HAVE_SYSTEMD', '1')
++endif
++
+ if get_option('enable-colorhug')
+ colorhug = dependency('colorhug', version : '>= 1.2.12')
+ conf.set('HAVE_COLORHUG', '1')
+@@ -220,4 +224,6 @@
+ message('git not found, you will not be able to run `ninja dist`')
+ endif
+
+-meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
++if get_option('with-systemd') and systemd.found()
++ meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
++endif
+--- fwupd-0.9.2/meson_options.txt
++++ fwupd-0.9.2/meson_options.txt
+@@ -5,3 +5,4 @@
+ option('enable-dell', type : 'boolean', value : true, description : 'enable Dell-specific support')
+ option('enable-thunderbolt', type : 'boolean', value : true, description : 'enable Thunderbolt support')
+ option('with-bootdir', type : 'string', value : '/boot/efi', description : 'Directory for EFI system partition')
++option('with-systemd', type : 'boolean', value : true, description : 'Install systemd unit files')
diff --git a/sys-apps/fwupd/fwupd-0.8.0.ebuild b/sys-apps/fwupd/fwupd-0.8.0.ebuild
new file mode 100644
index 00000000000..34825f2201f
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-0.8.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools udev systemd
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="http://www.fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colorhug dell doc elf nls uefi"
+
+RDEPEND="
+ app-crypt/gpgme
+ dev-db/sqlite
+ dev-libs/appstream-glib
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/libgpg-error
+ dev-libs/libgudev
+ dev-libs/libgusb
+ >=net-libs/libsoup-2.51.92:2.4
+ >=sys-auth/polkit-0.103
+ colorhug? ( >=x11-misc/colord-1.2.12:0= )
+ dell? (
+ sys-libs/efivar
+ >=sys-libs/libsmbios-2.3.0
+ )
+ elf? ( dev-libs/libelf )
+ uefi? ( >=sys-apps/fwupdate-5 )
+"
+DEPEND="
+ ${RDEPEND}
+ app-arch/gcab
+ app-arch/libarchive
+ app-text/docbook-sgml-utils
+ dev-util/gtk-doc
+ virtual/pkgconfig
+"
+
+REQUIRED_USE="dell? ( uefi )"
+
+src_prepare() {
+ default
+
+ # Don't look for gtk-doc if doc USE is unset (breaks automake)
+ if ! use doc ; then
+ sed 's@^GTK_DOC_CHECK@#\0@' -i configure.ac || die
+ sed '/gtk-doc\.make/d' \
+ -i {.,docs/{libdfu,libfwupd}}/Makefile.am || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ # requires libtbtfwu which is not packaged yet
+ --disable-thunderbolt
+ --with-systemdunitdir="$(systemd_get_systemunitdir)"
+ --with-udevrulesdir="$(get_udevdir)"/rules.d
+ $(use_enable colorhug)
+ $(use_enable dell)
+ $(use_enable dell synaptics)
+ $(use_enable elf libelf)
+ $(use_enable nls)
+ $(use_enable uefi)
+ )
+ econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/fwupd/fwupd-0.9.2.ebuild b/sys-apps/fwupd/fwupd-0.9.2.ebuild
new file mode 100644
index 00000000000..2c75aab5586
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-0.9.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson udev systemd
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="http://www.fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colorhug dell doc elf nls systemd uefi"
+
+RDEPEND="
+ app-crypt/gpgme
+ dev-db/sqlite
+ dev-libs/appstream-glib
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/libgpg-error
+ dev-libs/libgudev
+ dev-libs/libgusb
+ >=net-libs/libsoup-2.51.92:2.4
+ >=sys-auth/polkit-0.103
+ colorhug? ( >=x11-misc/colord-1.2.12:0= )
+ dell? (
+ sys-libs/efivar
+ >=sys-libs/libsmbios-2.3.0
+ )
+ elf? ( dev-libs/libelf )
+ systemd? ( sys-apps/systemd )
+ uefi? ( >=sys-apps/fwupdate-5 )
+"
+DEPEND="
+ ${RDEPEND}
+ app-arch/gcab
+ app-arch/libarchive
+ app-text/docbook-sgml-utils
+ dev-util/gtk-doc
+ virtual/pkgconfig
+"
+
+REQUIRED_USE="dell? ( uefi )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9-polkit_its_files.patch"
+ "${FILESDIR}/${PN}-0.9.2-no_systemd.patch"
+)
+
+src_configure() {
+ local emesonargs=(
+ # requires libtbtfwu which is not packaged yet
+ -Denable-thunderbolt=false
+ -Dwith-systemd="$(usex systemd true false)"
+ -Dwith-udevrulesdir="$(get_udevdir)"/rules.d
+ -Denable-colorhug="$(usex colorhug true false)"
+ -Denable-dell="$(usex dell true false)"
+ -Denable-libelf="$(usex elf true false)"
+ -Denable-uefi="$(usex uefi true false)"
+ )
+ meson_src_configure
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
new file mode 100644
index 00000000000..f9ea570938d
--- /dev/null
+++ b/sys-apps/fwupd/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <use>
+ <flag name="colorhug">Enable ColorHug support through
+ <pkg>x11-misc/colord</pkg> package.</flag>
+ <flag name="dell">Enable Dell-specific support.</flag>
+ <flag name="elf">Enable libelf support through
+ <pkg>dev-libs/libelf</pkg> package.</flag>
+ <flag name="uefi">Enable UEFI support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">hughsie/fwupd</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2017-07-05 6:29 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2017-07-05 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 80ef2a190ca5d5854e01f98087bc0a1c4213051c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 5 06:29:19 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jul 5 06:29:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ef2a19
sys-apps/fwupd: Removed old.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sys-apps/fwupd/Manifest | 2 -
sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch | 77 -----------------------
sys-apps/fwupd/fwupd-0.8.0.ebuild | 74 ----------------------
sys-apps/fwupd/fwupd-0.9.2.ebuild | 65 -------------------
4 files changed, 218 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index b1bd46fd110..ff15da82ca8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,4 +1,2 @@
-DIST fwupd-0.8.0.tar.gz 1296361 SHA256 b9c7550778747a2c47270ae518c65ab1111f749bbbd8f058ed7177201b414c10 SHA512 76c52a6902a6a4d651ad8e3694edf9d21320197baa7faf84fe1d4809e8e5990db43ae949a90bd72df6110d0df77f5181bd425a846c22f5ef749b9b6dac045bf8 WHIRLPOOL e7bdbd74f500257cf674cf7131c90e345dc7e2596ae14bbc3b11ff236ce633bb104ed7237fab974cc7c5c6edebcbe678816e8653dc04370614a1c54d0cb5b977
-DIST fwupd-0.9.2.tar.gz 1313712 SHA256 a5a7a9886b0efbea57cbcbc841923a9272e4f26dd8658a8e1a90f6eec371cce1 SHA512 14dd3e7ee34f2bda0ed03d141715166ba7b4e69443f2ffd056e17a834d42ef8caa56d729b273e3890936c9b768c10ee6fbcf0d7e7d336c957901b93832ffe9c2 WHIRLPOOL 305e84be8c12a8f4da7897f7bb8c5599a608de315c90c5399c05637c65667f83e7187d851156643ebec7e402f3aecab320f02f4c2c1b69554b20561ce2a08b64
DIST fwupd-0.9.4.tar.gz 1355237 SHA256 ac6c02df4a00d541a205f17c0fa681cc5fe9161dd20cc28045c28cbe43b042e0 SHA512 f4a0b46f7689744b6ddac698b8908f6711b9318ccca9576eadf1fd9f00b266be9e8723309286505173b1f10f170542b67ff67d0ebf3678b23fc9bf8fed03f8ae WHIRLPOOL d4fe5c2cc997b72dc940fda5e01eece69e3a8e86b29b11766afcf806de693e7e5cc6603ecb5cd3c5a82c39344c583d061018e12ddbaa5b459195e5ed51c52459
DIST fwupd-0.9.5.tar.gz 1389768 SHA256 876bb4c1cc5b27bb5f30e1c5d81522c82554738bede9a811f9e352966e58453e SHA512 2a8ca8da2fffa71bdaa44b82aff1a4151441b8496793101d7d0b1ab984bfbb10a3a94c4ebae5cfc17241364ab7aed051252a70543ebe6a82dd8bdb5c6f52863d WHIRLPOOL b7d606acd35a58e25ee94045557899b1c9ea30941024cfb17bf3226f39dab7961c802abafc9ca6320e21ea1ca3792a0bd37fa942476dfd0b37c4ce3b4fe28b5b
diff --git a/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch b/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch
deleted file mode 100644
index 354b5e5800e..00000000000
--- a/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- fwupd-0.9.2/data/meson.build
-+++ fwupd-0.9.2/data/meson.build
-@@ -38,20 +38,22 @@
- 'system-services'),
- )
-
--# replace @bindir@
--configure_file(
-- input : 'fwupd-offline-update.service.in',
-- output : 'fwupd-offline-update.service',
-- configuration : con2,
-- install: true,
-- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
--)
-+if get_option('with-systemd') and systemd.found()
-+ # replace @bindir@
-+ configure_file(
-+ input : 'fwupd-offline-update.service.in',
-+ output : 'fwupd-offline-update.service',
-+ configuration : con2,
-+ install: true,
-+ install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-+ )
-
--# replace @localstatedir@ and @bootdir@
--configure_file(
-- input : 'fwupd.service.in',
-- output : 'fwupd.service',
-- configuration : con2,
-- install: true,
-- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
--)
-+ # replace @localstatedir@ and @bootdir@
-+ configure_file(
-+ input : 'fwupd.service.in',
-+ output : 'fwupd.service',
-+ configuration : con2,
-+ install: true,
-+ install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-+ )
-+endif
---- fwupd-0.9.2/meson.build
-+++ fwupd-0.9.2/meson.build
-@@ -127,13 +127,17 @@
- gpgme = cc.find_library('gpgme')
- gpgerror = cc.find_library('libgpg-error')
- libm = cc.find_library('libm', required: false)
--systemd = dependency('systemd')
- udev = dependency('udev')
-
- if valgrind.found()
- conf.set('HAVE_VALGRIND', '1')
- endif
-
-+if get_option('with-systemd')
-+ systemd = dependency('systemd')
-+ conf.set('HAVE_SYSTEMD', '1')
-+endif
-+
- if get_option('enable-colorhug')
- colorhug = dependency('colorhug', version : '>= 1.2.12')
- conf.set('HAVE_COLORHUG', '1')
-@@ -220,4 +224,6 @@
- message('git not found, you will not be able to run `ninja dist`')
- endif
-
--meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
-+if get_option('with-systemd') and systemd.found()
-+ meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
-+endif
---- fwupd-0.9.2/meson_options.txt
-+++ fwupd-0.9.2/meson_options.txt
-@@ -5,3 +5,4 @@
- option('enable-dell', type : 'boolean', value : true, description : 'enable Dell-specific support')
- option('enable-thunderbolt', type : 'boolean', value : true, description : 'enable Thunderbolt support')
- option('with-bootdir', type : 'string', value : '/boot/efi', description : 'Directory for EFI system partition')
-+option('with-systemd', type : 'boolean', value : true, description : 'Install systemd unit files')
diff --git a/sys-apps/fwupd/fwupd-0.8.0.ebuild b/sys-apps/fwupd/fwupd-0.8.0.ebuild
deleted file mode 100644
index 34825f2201f..00000000000
--- a/sys-apps/fwupd/fwupd-0.8.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools udev systemd
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="http://www.fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elf nls uefi"
-
-RDEPEND="
- app-crypt/gpgme
- dev-db/sqlite
- dev-libs/appstream-glib
- >=dev-libs/glib-2.45.8:2
- dev-libs/libgpg-error
- dev-libs/libgudev
- dev-libs/libgusb
- >=net-libs/libsoup-2.51.92:2.4
- >=sys-auth/polkit-0.103
- colorhug? ( >=x11-misc/colord-1.2.12:0= )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.3.0
- )
- elf? ( dev-libs/libelf )
- uefi? ( >=sys-apps/fwupdate-5 )
-"
-DEPEND="
- ${RDEPEND}
- app-arch/gcab
- app-arch/libarchive
- app-text/docbook-sgml-utils
- dev-util/gtk-doc
- virtual/pkgconfig
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
- default
-
- # Don't look for gtk-doc if doc USE is unset (breaks automake)
- if ! use doc ; then
- sed 's@^GTK_DOC_CHECK@#\0@' -i configure.ac || die
- sed '/gtk-doc\.make/d' \
- -i {.,docs/{libdfu,libfwupd}}/Makefile.am || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- # requires libtbtfwu which is not packaged yet
- --disable-thunderbolt
- --with-systemdunitdir="$(systemd_get_systemunitdir)"
- --with-udevrulesdir="$(get_udevdir)"/rules.d
- $(use_enable colorhug)
- $(use_enable dell)
- $(use_enable dell synaptics)
- $(use_enable elf libelf)
- $(use_enable nls)
- $(use_enable uefi)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/fwupd/fwupd-0.9.2.ebuild b/sys-apps/fwupd/fwupd-0.9.2.ebuild
deleted file mode 100644
index 32c27850e81..00000000000
--- a/sys-apps/fwupd/fwupd-0.9.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson udev systemd
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="http://www.fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell elf systemd uefi"
-
-RDEPEND="
- app-crypt/gpgme
- dev-db/sqlite
- dev-libs/appstream-glib
- >=dev-libs/glib-2.45.8:2
- dev-libs/libgpg-error
- dev-libs/libgudev
- dev-libs/libgusb
- >=net-libs/libsoup-2.51.92:2.4
- >=sys-auth/polkit-0.103
- colorhug? ( >=x11-misc/colord-1.2.12:0= )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.3.0
- )
- elf? ( dev-libs/libelf )
- systemd? ( sys-apps/systemd )
- uefi? ( >=sys-apps/fwupdate-5 )
-"
-DEPEND="
- ${RDEPEND}
- app-arch/gcab
- app-arch/libarchive
- app-text/docbook-sgml-utils
- dev-util/gtk-doc
- virtual/pkgconfig
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.9-polkit_its_files.patch"
- "${FILESDIR}/${PN}-0.9.2-no_systemd.patch"
-)
-
-src_configure() {
- local emesonargs=(
- # requires libtbtfwu which is not packaged yet
- -Denable-thunderbolt=false
- -Dwith-systemd="$(usex systemd true false)"
- -Dwith-udevrulesdir="$(get_udevdir)"/rules.d
- -Denable-colorhug="$(usex colorhug true false)"
- -Denable-dell="$(usex dell true false)"
- -Denable-libelf="$(usex elf true false)"
- -Denable-uefi="$(usex uefi true false)"
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2018-07-18 9:50 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2018-07-18 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 9c032389f603015319009857be202c0a9254147e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 09:47:07 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 09:50:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c032389
sys-apps/fwupd: Revbump to add openrc init script
which was kindly contributed by
Till Schäfer <till2.schaefer <AT> uni-dortmund.de>
Closes: https://bugs.gentoo.org/661324
Package-Manager: Portage-2.3.43, Repoman-2.3.10
sys-apps/fwupd/files/fwupd | 13 +++++++++++++
.../fwupd/{fwupd-1.1.0.ebuild => fwupd-1.1.0-r1.ebuild} | 16 ++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/sys-apps/fwupd/files/fwupd b/sys-apps/fwupd/files/fwupd
new file mode 100644
index 00000000000..b235bf82c6f
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Firmware update daemon"
+pidfile="/var/run/fwupd.pid"
+command="/usr/libexec/fwupd/fwupd"
+command_background="true"
+
+depend() {
+ need dbus
+ before xdm
+}
diff --git a/sys-apps/fwupd/fwupd-1.1.0.ebuild b/sys-apps/fwupd/fwupd-1.1.0-r1.ebuild
similarity index 85%
rename from sys-apps/fwupd/fwupd-1.1.0.ebuild
rename to sys-apps/fwupd/fwupd-1.1.0-r1.ebuild
index 431667267fa..f2cb5fbc14e 100644
--- a/sys-apps/fwupd/fwupd-1.1.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.1.0-r1.ebuild
@@ -74,6 +74,10 @@ DEPEND="
test? ( net-libs/gnutls[tools] )
"
+# required for fwupd daemon to run.
+# NOT a build time dependency. The build system does not check for dbus.
+PDEPEND="sys-apps/dbus"
+
src_prepare() {
default
sed -e "s/'--create'/'--absolute-name', '--create'/" \
@@ -102,3 +106,15 @@ src_configure() {
)
meson_src_configure
}
+
+src_install() {
+ meson_src_install
+ doinitd "${FILESDIR}"/${PN}
+}
+
+pkg_postinst() {
+ elog "In case you are using openrc as init system"
+ elog "and you're upgrading from <fwupd-1.1.0, you"
+ elog "need to start the fwupd daemon via the openrc"
+ elog "init script that comes with this package."
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2019-03-28 11:50 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2019-03-28 11:50 UTC (permalink / raw
To: gentoo-commits
commit: a97e004a0479196f3491137b23aa62eb613e5e3d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 11:50:19 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 11:50:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97e004a
sys-apps/fwupd: Removed old.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 -
sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch | 105 --------------------
sys-apps/fwupd/fwupd-1.2.4-r2.ebuild | 132 -------------------------
3 files changed, 238 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index d92d7642b33..7feb538b37b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,2 @@
-DIST fwupd-1.2.4.tar.gz 1808778 BLAKE2B 4dd8db0e73b148cba8ca43ec7942efa183f331a376b947421b8673d473ef868cef57e3abf4f50e031eb22f97fa8eb199b8bd7ef3b96efb598f842d0824c235a7 SHA512 7734be90459364c2e9ca35d9a9327e7becabe64cd0129d5c8f3cb4a95ef0195726c519862e843636952a3251ecea080907d1e6814c3037e9f90e8dde53b406ad
DIST fwupd-1.2.5.tar.gz 1818559 BLAKE2B 0d30248bf3be093d3764624294fdd6e26b979560d70b47e67b3ca5f213177d807e749f5e30abd4d7d7d15e4be507103583834062b6a3243367169019e24a1bc7 SHA512 dc6a0def49225ce50bc89c3f76137497d4c8b71f94e42546fbf5221dc0af504ce6090f803ea9dca175f6166ff1341f6a3eab04652d744257c9e88dbd6875abc7
DIST fwupd-1.2.6.tar.gz 1861765 BLAKE2B 160af03c0c08bed730657520a15f96c9881996807d186a26074f10b6b340e27b0e783ae7a6b1fc433e4347cba535d49bca60b4d242101a9097fc2749f3cca0ee SHA512 c1111fd881126bf85424dec004e4321948cbdd603ed79989eee51f48197f8f0f391371834964dd1bff52eb3b353cc4c2e5714f6ff674b23dbd8e8d0e8a87ff27
diff --git a/sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch b/sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch
deleted file mode 100644
index 1a8b7760001..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From de2b70bc7d0ca092659a0b5a4719e41444660b14 Mon Sep 17 00:00:00 2001
-From: Marcin Sucharski <marcin.sucharski@protonmail.com>
-Date: Sun, 24 Feb 2019 00:28:10 +0100
-Subject: [PATCH] Add elogind support
-
----
- data/meson.build | 27 ++++++++++++++++-----------
- meson.build | 6 ++++++
- meson_options.txt | 1 +
- src/fu-util-common.c | 4 ++--
- 4 files changed, 25 insertions(+), 13 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2d7fb632a..f9377c803 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -63,17 +63,6 @@ if get_option('systemd')
- endif
- con2.set('dynamic_options', '\n'.join(dynamic_options))
-
-- # replace @libexecdir@
-- configure_file(
-- input : 'org.freedesktop.fwupd.service.in',
-- output : 'org.freedesktop.fwupd.service',
-- configuration : con2,
-- install: true,
-- install_dir: join_paths(datadir,
-- 'dbus-1',
-- 'system-services'),
-- )
--
- # replace @bindir@
- configure_file(
- input : 'fwupd-offline-update.service.in',
-@@ -92,3 +81,19 @@ if get_option('systemd')
- install_dir: systemdunitdir,
- )
- endif
-+
-+if get_option('systemd') or get_option('elogind')
-+ con2 = configuration_data()
-+ con2.set('libexecdir', libexecdir)
-+
-+ # replace @libexecdir@
-+ configure_file(
-+ input : 'org.freedesktop.fwupd.service.in',
-+ output : 'org.freedesktop.fwupd.service',
-+ configuration : con2,
-+ install: true,
-+ install_dir: join_paths(datadir,
-+ 'dbus-1',
-+ 'system-services'),
-+ )
-+endif
-diff --git a/meson.build b/meson.build
-index f4f0af192..d645db2ae 100644
---- a/meson.build
-+++ b/meson.build
-@@ -270,6 +270,12 @@ endif
- if get_option('systemd')
- systemd = dependency('systemd', version : '>= 211')
- conf.set('HAVE_SYSTEMD' , '1')
-+ conf.set('HAVE_LOGIND' , '1')
-+endif
-+
-+if get_option('elogind')
-+ elogind = dependency('libelogind', version : '>= 211')
-+ conf.set('HAVE_LOGIND' , '1')
- endif
-
- if get_option('consolekit')
-diff --git a/meson_options.txt b/meson_options.txt
-index c9b7ba675..6b0902225 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -18,6 +18,7 @@ option('plugin_uefi', type : 'boolean', value : true, description : 'enable UEFI
- option('plugin_nvme', type : 'boolean', value : true, description : 'enable NVMe support')
- option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
- option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
-+option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
- option('tests', type : 'boolean', value : true, description : 'enable tests')
- option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
- option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
-diff --git a/src/fu-util-common.c b/src/fu-util-common.c
-index cdeb2ff6b..667c142fb 100644
---- a/src/fu-util-common.c
-+++ b/src/fu-util-common.c
-@@ -184,7 +184,7 @@ fu_util_update_shutdown (GError **error)
- if (connection == NULL)
- return FALSE;
-
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_LOGIND
- /* shutdown using logind */
- val = g_dbus_connection_call_sync (connection,
- "org.freedesktop.login1",
-@@ -229,7 +229,7 @@ fu_util_update_reboot (GError **error)
- if (connection == NULL)
- return FALSE;
-
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_LOGIND
- /* reboot using logind */
- val = g_dbus_connection_call_sync (connection,
- "org.freedesktop.login1",
diff --git a/sys-apps/fwupd/fwupd-1.2.4-r2.ebuild b/sys-apps/fwupd/fwupd-1.2.4-r2.ebuild
deleted file mode 100644
index 43db76e1c25..00000000000
--- a/sys-apps/fwupd/fwupd-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( elogind systemd )
- dell? ( uefi )
-"
-
-RDEPEND="${PYTHON_DEPS}
- app-arch/gcab
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection]
- >=dev-libs/libxmlb-0.1.5
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- >=net-libs/libsoup-2.51.92:2.4[introspection]
- >=sys-auth/polkit-0.103
- virtual/libelf:0=
- colorhug? ( >=x11-misc/colord-1.2.12:0= )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.4.0
- )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- nvme? ( sys-libs/efivar )
- pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
- redfish? ( sys-libs/efivar )
- !systemd? (
- !elogind? ( >=sys-auth/consolekit-1.0.0 )
- elogind? ( sys-auth/elogind )
- )
- systemd? ( >=sys-apps/systemd-211 )
- thunderbolt? ( sys-apps/thunderbolt-software-user-space )
- uefi? (
- media-libs/fontconfig
- media-libs/freetype
- sys-boot/gnu-efi
- >=sys-libs/efivar-33
- x11-libs/cairo
- )
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- x11-libs/pango[introspection]
- nvme? ( >=sys-kernel/linux-headers-4.4 )
- test? ( net-libs/gnutls[tools] )
-"
-BDEPEND="
- >=dev-util/meson-0.47.0
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
- man? ( app-text/docbook-sgml-utils )
-"
-
-# required for fwupd daemon to run.
-# NOT a build time dependency. The build system does not check for dbus.
-PDEPEND="sys-apps/dbus"
-
-PATCHES=( "${FILESDIR}/${P}-elogind.patch" ) # bug 668522
-
-src_prepare() {
- default
- sed -e "s/'--create'/'--absolute-name', '--create'/" \
- -i data/tests/builder/meson.build || die
- sed -e "/'-Werror',/d" \
- -i plugins/uefi/efi/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- xdg_environment_reset
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dgtkdoc="$(usex doc true false)"
- -Delogind="$(usex elogind true false)"
- -Dgpg="$(usex gpg true false)"
- -Dman="$(usex man true false)"
- -Dpkcs7="$(usex pkcs7 true false)"
- -Dplugin_dell="$(usex dell true false)"
- -Dplugin_nvme="$(usex nvme true false)"
- -Dplugin_redfish="$(usex redfish true false)"
- -Dplugin_synaptics="$(usex dell true false)"
- -Dplugin_thunderbolt="$(usex thunderbolt true false)"
- -Dplugin_uefi="$(usex uefi true false)"
- -Dsystemd="$(usex systemd true false)"
- -Dtests="$(usex test true false)"
- )
- use elogind || use systemd || emesonargs+=( -Dconsolekit=true )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- doinitd "${FILESDIR}"/${PN}
-
- if ! use systemd && ! use elogind ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
-}
-
-pkg_postinst() {
- elog "In case you are using openrc as init system"
- elog "and you're upgrading from <fwupd-1.1.0, you"
- elog "need to start the fwupd daemon via the openrc"
- elog "init script that comes with this package."
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2019-03-31 18:40 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2019-03-31 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 4dcdcebb67254368e849588d350842f8b6daba4e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 18:40:08 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 18:40:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dcdcebb
sys-apps/fwupd: Revbump to fix init script with USE="elogind"
Closes: https://bugs.gentoo.org/682140
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/files/fwupd-r1 | 13 +++++++++++++
.../fwupd/{fwupd-1.2.6.ebuild => fwupd-1.2.6-r1.ebuild} | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/sys-apps/fwupd/files/fwupd-r1 b/sys-apps/fwupd/files/fwupd-r1
new file mode 100644
index 00000000000..4a4865ef15a
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-r1
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Firmware update daemon"
+pidfile="/var/run/fwupd.pid"
+command="/usr/libexec/fwupd/fwupd"
+command_background="true"
+
+depend() {
+ need %SEAT_MANAGER% dbus
+ before xdm
+}
diff --git a/sys-apps/fwupd/fwupd-1.2.6.ebuild b/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
similarity index 96%
rename from sys-apps/fwupd/fwupd-1.2.6.ebuild
rename to sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
index 4f9584b78f9..3006840299e 100644
--- a/sys-apps/fwupd/fwupd-1.2.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
@@ -122,7 +122,11 @@ src_configure() {
src_install() {
meson_src_install
- doinitd "${FILESDIR}"/${PN}
+
+ sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+ "${FILESDIR}"/${PN}-r1 \
+ > "${T}"/${PN} || die
+ doinitd "${T}"/${PN}
if ! use systemd ; then
# Don't timeout when fwupd is running (#673140)
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2019-04-15 12:18 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2019-04-15 12:18 UTC (permalink / raw
To: gentoo-commits
commit: dfe495a3668f29d0cdfdc4abeef5b72c78115d94
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 12:11:33 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 12:11:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe495a3
sys-apps/fwupd: Removed old.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 -
sys-apps/fwupd/files/fwupd | 13 ----
sys-apps/fwupd/fwupd-1.2.5.ebuild | 136 --------------------------------------
3 files changed, 150 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index d34ea680aff..dc972f6cf11 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,2 @@
-DIST fwupd-1.2.5.tar.gz 1818559 BLAKE2B 0d30248bf3be093d3764624294fdd6e26b979560d70b47e67b3ca5f213177d807e749f5e30abd4d7d7d15e4be507103583834062b6a3243367169019e24a1bc7 SHA512 dc6a0def49225ce50bc89c3f76137497d4c8b71f94e42546fbf5221dc0af504ce6090f803ea9dca175f6166ff1341f6a3eab04652d744257c9e88dbd6875abc7
DIST fwupd-1.2.6.tar.gz 1861765 BLAKE2B 160af03c0c08bed730657520a15f96c9881996807d186a26074f10b6b340e27b0e783ae7a6b1fc433e4347cba535d49bca60b4d242101a9097fc2749f3cca0ee SHA512 c1111fd881126bf85424dec004e4321948cbdd603ed79989eee51f48197f8f0f391371834964dd1bff52eb3b353cc4c2e5714f6ff674b23dbd8e8d0e8a87ff27
DIST fwupd-1.2.7.tar.gz 1899554 BLAKE2B aed0377135354c6391f63eb0802d27b5359efdb0f9d3b5c1a55ba8fe7ef0c84c9201e689d8a1bdde998e8147b25767e4dc7586c57bcf33e9f9e9d807e38e7a04 SHA512 12b5c193ab6e55e14256ea84273d139e7353618b6524197ba1f4477db32071e33a73b3e2e2b34733ca6269c4dbad5a03f2d3546b27d22b2a6db23989c69be6e5
diff --git a/sys-apps/fwupd/files/fwupd b/sys-apps/fwupd/files/fwupd
deleted file mode 100644
index 156d1562e36..00000000000
--- a/sys-apps/fwupd/files/fwupd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Firmware update daemon"
-pidfile="/var/run/fwupd.pid"
-command="/usr/libexec/fwupd/fwupd"
-command_background="true"
-
-depend() {
- need consolekit dbus
- before xdm
-}
diff --git a/sys-apps/fwupd/fwupd-1.2.5.ebuild b/sys-apps/fwupd/fwupd-1.2.5.ebuild
deleted file mode 100644
index ab622891d22..00000000000
--- a/sys-apps/fwupd/fwupd-1.2.5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="colorhug dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( elogind systemd )
- dell? ( uefi )
-"
-
-RDEPEND="${PYTHON_DEPS}
- app-arch/gcab
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection]
- >=dev-libs/libxmlb-0.1.5
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- >=net-libs/libsoup-2.51.92:2.4[introspection]
- >=sys-auth/polkit-0.103
- virtual/libelf:0=
- colorhug? ( >=x11-misc/colord-1.2.12:0= )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.4.0
- )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- nvme? ( sys-libs/efivar )
- pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
- redfish? ( sys-libs/efivar )
- !systemd? (
- !elogind? ( >=sys-auth/consolekit-1.0.0 )
- elogind? ( sys-auth/elogind )
- )
- systemd? ( >=sys-apps/systemd-211 )
- thunderbolt? ( sys-apps/thunderbolt-software-user-space )
- uefi? (
- media-libs/fontconfig
- media-libs/freetype
- sys-boot/gnu-efi
- >=sys-libs/efivar-33
- x11-libs/cairo
- )
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- x11-libs/pango[introspection]
- nvme? ( >=sys-kernel/linux-headers-4.4 )
- test? ( net-libs/gnutls[tools] )
-"
-BDEPEND="
- >=dev-util/meson-0.47.0
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
- man? ( app-text/docbook-sgml-utils )
-"
-
-# required for fwupd daemon to run.
-# NOT a build time dependency. The build system does not check for dbus.
-PDEPEND="sys-apps/dbus"
-
-src_prepare() {
- default
- sed -e "s/'--create'/'--absolute-name', '--create'/" \
- -i data/tests/builder/meson.build || die
- sed -e "/'-Werror',/d" \
- -i plugins/uefi/efi/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- xdg_environment_reset
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dgtkdoc="$(usex doc true false)"
- -Delogind="$(usex elogind true false)"
- -Dgpg="$(usex gpg true false)"
- -Dman="$(usex man true false)"
- -Dpkcs7="$(usex pkcs7 true false)"
- -Dplugin_dell="$(usex dell true false)"
- -Dplugin_nvme="$(usex nvme true false)"
- -Dplugin_redfish="$(usex redfish true false)"
- -Dplugin_synaptics="$(usex dell true false)"
- -Dplugin_thunderbolt="$(usex thunderbolt true false)"
- -Dplugin_uefi="$(usex uefi true false)"
- -Dsystemd="$(usex systemd true false)"
- -Dtests="$(usex test true false)"
- )
-
- if use elogind || use systemd ; then
- emesonargs+=( -Dconsolekit=false )
- else
- emesonargs+=( -Dconsolekit=true )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- doinitd "${FILESDIR}"/${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
-}
-
-pkg_postinst() {
- elog "In case you are using openrc as init system"
- elog "and you're upgrading from <fwupd-1.1.0, you"
- elog "need to start the fwupd daemon via the openrc"
- elog "init script that comes with this package."
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2020-02-17 9:11 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2020-02-17 9:11 UTC (permalink / raw
To: gentoo-commits
commit: e9383563a1f114c0214768ffc446e0959c5890b8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 09:10:49 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 09:10:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9383563
sys-apps/fwupd: Bump to version 1.3.8
Thanks-to: AE <vltg0903 <AT> gmx.net>
Closes: https://bugs.gentoo.org/709496
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
.../fwupd/files/fwupd-1.3.8-report_uploading.patch | 34 +++++
sys-apps/fwupd/fwupd-1.3.8.ebuild | 168 +++++++++++++++++++++
3 files changed, 203 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index f37c760c4c2..4d30214b4a0 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,4 @@
DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e
+DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4
diff --git a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
new file mode 100644
index 00000000000..c0e006a7536
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
@@ -0,0 +1,34 @@
+From 5c7e17276c8eb0c2a845cecb7d644a4bccf80519 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@dell.com>
+Date: Thu, 13 Feb 2020 12:06:41 -0600
+Subject: [PATCH] fu-util: fix a logic error in report uploading introduced in
+ e076d48afb74d1447936d353f12781755f13b047
+
+Fixes: #1770
+---
+ src/fu-util.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/fu-util.c b/src/fu-util.c
+index 5bcffedeb..e6531c90c 100644
+--- a/src/fu-util.c
++++ b/src/fu-util.c
+@@ -286,16 +286,12 @@ fu_util_maybe_enable_automatic (FuUtilPrivate *priv, GPtrArray *remotes, GError
+ NULL, error))
+ return FALSE;
+ }
+- return TRUE;
++ break;
+ default:
+ break;
+ }
+
+- g_set_error_literal (error,
+- FWUPD_ERROR,
+- FWUPD_ERROR_NOTHING_TO_DO,
+- "invalid option selected");
+- return FALSE;
++ return TRUE;
+ }
+
+ static gboolean
diff --git a/sys-apps/fwupd/fwupd-1.3.8.ebuild b/sys-apps/fwupd/fwupd-1.3.8.ebuild
new file mode 100644
index 00000000000..ca087051eeb
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.3.8.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( consolekit elogind minimal systemd )
+ dell? ( uefi )
+ minimal? ( !introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ introspection? ( dev-libs/gobject-introspection )
+ man? (
+ app-text/docbook-sgml-utils
+ sys-apps/help2man
+ )
+ test? (
+ thunderbolt? ( dev-util/umockdev )
+ net-libs/gnutls[tools]
+ )
+"
+DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ app-arch/libarchive:=
+ dev-db/sqlite
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/json-glib
+ dev-libs/libgpg-error
+ dev-libs/libgudev:=
+ >=dev-libs/libgusb-0.2.9[introspection?]
+ >=dev-libs/libxmlb-0.1.13
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+ ')
+ >=net-libs/libsoup-2.51.92:2.4[introspection?]
+ virtual/libelf:0=
+ virtual/udev
+ consolekit? ( >=sys-auth/consolekit-1.0.0 )
+ dell? (
+ sys-libs/efivar
+ >=sys-libs/libsmbios-2.4.0
+ )
+ elogind? ( sys-auth/elogind )
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ !minimal? (
+ >=sys-auth/polkit-0.103
+ )
+ nvme? ( sys-libs/efivar )
+ pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+ redfish? ( sys-libs/efivar )
+ systemd? ( >=sys-apps/systemd-211 )
+ thunderbolt? (
+ sys-apps/thunderbolt-software-user-space
+ )
+ tpm? ( app-crypt/tpm2-tss )
+ uefi? (
+ app-crypt/tpm2-tss
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-boot/gnu-efi
+ sys-boot/efibootmgr
+ >=sys-libs/efivar-33
+ x11-libs/cairo
+ )
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+ !<sci-chemistry/chemical-mime-data-0.1.94-r4
+ ${DEPEND}
+ sys-apps/dbus
+"
+
+PATCHES=(
+ # https://github.com/fwupd/fwupd/issues/1770
+ "${FILESDIR}"/${P}-report_uploading.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use nvme; then
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+ fi
+}
+
+src_prepare() {
+ default
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ $(meson_use agent)
+ $(meson_use amt plugin_amt)
+ $(meson_use consolekit)
+ $(meson_use dell plugin_dell)
+ $(meson_use elogind)
+ $(meson_use gpg)
+ $(meson_use gtk-doc gtkdoc)
+ $(meson_use man)
+ $(meson_use nvme plugin_nvme)
+ $(meson_use pkcs7)
+ $(meson_use redfish plugin_redfish)
+ $(meson_use synaptics plugin_synaptics)
+ $(meson_use systemd)
+ $(meson_use test tests)
+ $(meson_use thunderbolt plugin_thunderbolt)
+ $(meson_use tpm plugin_tpm)
+ $(meson_use uefi plugin_uefi)
+ # Requires libflashrom which our sys-apps/flashrom
+ # package does not provide
+ -Dplugin_flashrom="false"
+ # Dependencies are not available (yet?)
+ -Dplugin_modem_manager="false"
+ )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+ "${FILESDIR}"/${PN}-r1 \
+ > "${T}"/${PN} || die
+ doinitd "${T}"/${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "In case you are using openrc as init system"
+ elog "and you're upgrading from <fwupd-1.1.0, you"
+ elog "need to start the fwupd daemon via the openrc"
+ elog "init script that comes with this package."
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2020-03-06 12:36 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2020-03-06 12:36 UTC (permalink / raw
To: gentoo-commits
commit: 56bb5e22b7af8e4a7f5c1583a2479767c0ee42d4
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 12:30:45 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 6 12:36:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56bb5e22
sys-apps/fwupd: Bump to version 1.3.9
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
.../fwupd/files/fwupd-1.3.9-logind_plugin.patch | 13 ++
sys-apps/fwupd/fwupd-1.3.9.ebuild | 167 +++++++++++++++++++++
3 files changed, 181 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 4d30214b4a0..df0d2dcc6dc 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,3 +2,4 @@ DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab
DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e
DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4
+DIST fwupd-1.3.9.tar.gz 2254260 BLAKE2B ead64be3eca00fd2d045fb6c5ccd42d8913fa056736e6ae039feef70b6edababe50fb0552db39bf057750d3f0d2224b18b7ecf5a5a408a1f1ac3023d89687f68 SHA512 b81ef1f683082e4c49ab8acd8848118fed1383d4e3e73967daaa68927e553a5bc4973004d3dd26b268b901c5deb1f9238a98537d24cfd957162f508c9622e1e4
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch b/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch
new file mode 100644
index 00000000000..526fe7700ed
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch
@@ -0,0 +1,13 @@
+Enable logind plugin when -Delogind=true is set as well
+
+--- fwupd-1.3.9/plugins/meson.build
++++ fwupd-1.3.9/plugins/meson.build
+@@ -27,7 +27,7 @@
+ subdir('wacom-raw')
+ endif
+
+-if get_option('systemd')
++if get_option('systemd') or get_option('elogind')
+ subdir('logind')
+ endif
+
diff --git a/sys-apps/fwupd/fwupd-1.3.9.ebuild b/sys-apps/fwupd/fwupd-1.3.9.ebuild
new file mode 100644
index 00000000000..a10af44195e
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.3.9.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( consolekit elogind minimal systemd )
+ dell? ( uefi )
+ minimal? ( !introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ introspection? ( dev-libs/gobject-introspection )
+ man? (
+ app-text/docbook-sgml-utils
+ sys-apps/help2man
+ )
+ test? (
+ thunderbolt? ( dev-util/umockdev )
+ net-libs/gnutls[tools]
+ )
+"
+DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ app-arch/libarchive:=
+ dev-db/sqlite
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/json-glib
+ dev-libs/libgpg-error
+ dev-libs/libgudev:=
+ >=dev-libs/libgusb-0.2.9[introspection?]
+ >=dev-libs/libxmlb-0.1.13
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+ ')
+ >=net-libs/libsoup-2.51.92:2.4[introspection?]
+ virtual/libelf:0=
+ virtual/udev
+ consolekit? ( >=sys-auth/consolekit-1.0.0 )
+ dell? (
+ sys-libs/efivar
+ >=sys-libs/libsmbios-2.4.0
+ )
+ elogind? ( sys-auth/elogind )
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ !minimal? (
+ >=sys-auth/polkit-0.103
+ )
+ nvme? ( sys-libs/efivar )
+ pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+ redfish? ( sys-libs/efivar )
+ systemd? ( >=sys-apps/systemd-211 )
+ thunderbolt? (
+ sys-apps/thunderbolt-software-user-space
+ )
+ tpm? ( app-crypt/tpm2-tss )
+ uefi? (
+ app-crypt/tpm2-tss
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-boot/gnu-efi
+ sys-boot/efibootmgr
+ >=sys-libs/efivar-33
+ x11-libs/cairo
+ )
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+ !<sci-chemistry/chemical-mime-data-0.1.94-r4
+ ${DEPEND}
+ sys-apps/dbus
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use nvme; then
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+ fi
+}
+
+src_prepare() {
+ default
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ $(meson_use agent)
+ $(meson_use amt plugin_amt)
+ $(meson_use consolekit)
+ $(meson_use dell plugin_dell)
+ $(meson_use elogind)
+ $(meson_use gpg)
+ $(meson_use gtk-doc gtkdoc)
+ $(meson_use man)
+ $(meson_use nvme plugin_nvme)
+ $(meson_use pkcs7)
+ $(meson_use redfish plugin_redfish)
+ $(meson_use synaptics plugin_synaptics)
+ $(meson_use systemd)
+ $(meson_use test tests)
+ $(meson_use thunderbolt plugin_thunderbolt)
+ $(meson_use tpm plugin_tpm)
+ $(meson_use uefi plugin_uefi)
+ # Requires libflashrom which our sys-apps/flashrom
+ # package does not provide
+ -Dplugin_flashrom="false"
+ # Dependencies are not available (yet?)
+ -Dplugin_modem_manager="false"
+ )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+ "${FILESDIR}"/${PN}-r1 \
+ > "${T}"/${PN} || die
+ doinitd "${T}"/${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "In case you are using openrc as init system"
+ elog "and you're upgrading from <fwupd-1.1.0, you"
+ elog "need to start the fwupd daemon via the openrc"
+ elog "init script that comes with this package."
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2020-03-06 15:23 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2020-03-06 15:23 UTC (permalink / raw
To: gentoo-commits
commit: a64ae1d3b6f3af052521ec5a14ba07267c88bcc5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 15:22:26 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 6 15:22:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64ae1d3
sys-apps/fwupd: Fixed build with USE="-agent man"
Thanks-to: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Closes: https://bugs.gentoo.org/711682
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../fwupd-1.3.9-optional_agent_man_page.patch | 57 ++++++++++++++++++++++
sys-apps/fwupd/fwupd-1.3.9.ebuild | 1 +
2 files changed, 58 insertions(+)
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
new file mode 100644
index 00000000000..6c9898557ff
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
@@ -0,0 +1,57 @@
+From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 6 Mar 2020 16:00:23 +0100
+Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not
+ requested
+
+Otherwise build fails with:
+
+ src/meson.build:196:2: ERROR: Unknown variable "fwupdagent".
+
+Gentoo-bug: https://bugs.gentoo.org/711682
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/meson.build | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 46a9c4ded..e9aac607e 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -193,20 +193,22 @@ if build_daemon and get_option('man')
+ install : true,
+ install_dir : join_paths(mandir, 'man1'),
+ )
+- custom_target('fwupdagent-man',
+- input : fwupdagent,
+- output : 'fwupdagent.1',
+- command : [
+- help2man, '@INPUT@',
+- '--no-info',
+- '--output', '@OUTPUT@',
+- '--name', 'Firmware updating agent',
+- '--manual', 'User Commands',
+- '--version-string', fwupd_version,
+- ],
+- install : true,
+- install_dir : join_paths(mandir, 'man1'),
+- )
++ if get_option('agent')
++ custom_target('fwupdagent-man',
++ input : fwupdagent,
++ output : 'fwupdagent.1',
++ command : [
++ help2man, '@INPUT@',
++ '--no-info',
++ '--output', '@OUTPUT@',
++ '--name', 'Firmware updating agent',
++ '--manual', 'User Commands',
++ '--version-string', fwupd_version,
++ ],
++ install : true,
++ install_dir : join_paths(mandir, 'man1'),
++ )
++ endif
+ endif
+ if get_option('man')
+ custom_target('fwupdtool-man',
diff --git a/sys-apps/fwupd/fwupd-1.3.9.ebuild b/sys-apps/fwupd/fwupd-1.3.9.ebuild
index a10af44195e..03fab547386 100644
--- a/sys-apps/fwupd/fwupd-1.3.9.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.9.ebuild
@@ -93,6 +93,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+ "${FILESDIR}/${P}-optional_agent_man_page.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2020-03-06 15:26 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2020-03-06 15:26 UTC (permalink / raw
To: gentoo-commits
commit: bc2bb596101c147201c06f6c0c5be00e4d4a4378
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 15:26:05 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 6 15:26:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2bb596
sys-apps/fwupd: Revbump to fix path to fwupdtool
Thanks-to: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../fwupd/files/fwupd-1.3.9-fwupdtool_path.patch | 20 ++++++++++++++++++++
.../{fwupd-1.3.9.ebuild => fwupd-1.3.9-r1.ebuild} | 1 +
2 files changed, 21 insertions(+)
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
new file mode 100644
index 00000000000..a01e5fbe570
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
@@ -0,0 +1,20 @@
+From 4e381f2a61c6ea4eb7438c14f76b8301762a800c Mon Sep 17 00:00:00 2001
+From: Dennis Kadioglu <dkadioglu@web.de>
+Date: Thu, 5 Mar 2020 09:37:56 +0100
+Subject: [PATCH] fix fwupd.shutdown.in according to the movement of fwupdtool
+ to bindir
+
+---
+ data/fwupd.shutdown.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/fwupd.shutdown.in b/data/fwupd.shutdown.in
+index 4c027e7ab..53b334555 100755
+--- a/data/fwupd.shutdown.in
++++ b/data/fwupd.shutdown.in
+@@ -4,4 +4,4 @@
+ [ -f @localstatedir@/lib/fwupd/pending.db ] || exit 0
+
+ # activate firmware when we have a read-only filesysten
+-@libexecdir@/fwupd/fwupdtool activate
++@bindir@/fwupdtool activate
diff --git a/sys-apps/fwupd/fwupd-1.3.9.ebuild b/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild
similarity index 99%
rename from sys-apps/fwupd/fwupd-1.3.9.ebuild
rename to sys-apps/fwupd/fwupd-1.3.9-r1.ebuild
index 03fab547386..6f4ebb4daa9 100644
--- a/sys-apps/fwupd/fwupd-1.3.9.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild
@@ -94,6 +94,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
"${FILESDIR}/${P}-optional_agent_man_page.patch"
+ "${FILESDIR}/${P}-fwupdtool_path.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2020-06-15 11:38 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2020-06-15 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 85c5d3e22d8a4dc6e2732523f707bb3ff762d91e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 11:37:57 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 11:38:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c5d3e2
sys-apps/fwupd: Removed old
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 2 -
.../fwupd/files/fwupd-1.3.8-report_uploading.patch | 34 -----
sys-apps/fwupd/fwupd-1.3.8.ebuild | 165 ---------------------
sys-apps/fwupd/fwupd-1.4.1.ebuild | 158 --------------------
4 files changed, 359 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 40eb716c7da..307b42608c8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,7 +1,5 @@
DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
-DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4
DIST fwupd-1.3.9.tar.gz 2254260 BLAKE2B ead64be3eca00fd2d045fb6c5ccd42d8913fa056736e6ae039feef70b6edababe50fb0552db39bf057750d3f0d2224b18b7ecf5a5a408a1f1ac3023d89687f68 SHA512 b81ef1f683082e4c49ab8acd8848118fed1383d4e3e73967daaa68927e553a5bc4973004d3dd26b268b901c5deb1f9238a98537d24cfd957162f508c9622e1e4
-DIST fwupd-1.4.1.tar.gz 2301866 BLAKE2B 057c7cdc4449aa67540719e6b7b1f073e8b247aa80dd99cb4b1c4ebf7c368c5089ddc25200bb0a42706196e3025c21a5d09f5f507d52e5c0fc5fc6d5c1eacd46 SHA512 abec0c2d66bd7e256cefa5e0ce59bbf339ea2ffb6173671c7f6cf8893b0931c16c48c47153507bc1af3f31157dba8bddf566bba1b62b8a722fa1f50780a1f921
DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e
DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a
diff --git a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
deleted file mode 100644
index c0e006a7536..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5c7e17276c8eb0c2a845cecb7d644a4bccf80519 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@dell.com>
-Date: Thu, 13 Feb 2020 12:06:41 -0600
-Subject: [PATCH] fu-util: fix a logic error in report uploading introduced in
- e076d48afb74d1447936d353f12781755f13b047
-
-Fixes: #1770
----
- src/fu-util.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/fu-util.c b/src/fu-util.c
-index 5bcffedeb..e6531c90c 100644
---- a/src/fu-util.c
-+++ b/src/fu-util.c
-@@ -286,16 +286,12 @@ fu_util_maybe_enable_automatic (FuUtilPrivate *priv, GPtrArray *remotes, GError
- NULL, error))
- return FALSE;
- }
-- return TRUE;
-+ break;
- default:
- break;
- }
-
-- g_set_error_literal (error,
-- FWUPD_ERROR,
-- FWUPD_ERROR_NOTHING_TO_DO,
-- "invalid option selected");
-- return FALSE;
-+ return TRUE;
- }
-
- static gboolean
diff --git a/sys-apps/fwupd/fwupd-1.3.8.ebuild b/sys-apps/fwupd/fwupd-1.3.8.ebuild
deleted file mode 100644
index 52570fdd06b..00000000000
--- a/sys-apps/fwupd/fwupd-1.3.8.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( consolekit elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection?]
- >=dev-libs/libxmlb-0.1.13
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- virtual/libelf:0=
- virtual/udev
- consolekit? ( >=sys-auth/consolekit-1.0.0 )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.4.0
- )
- elogind? ( sys-auth/elogind )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- !minimal? (
- >=sys-auth/polkit-0.103
- )
- nvme? ( sys-libs/efivar )
- pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
- redfish? ( sys-libs/efivar )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- app-crypt/tpm2-tss
- media-libs/fontconfig
- media-libs/freetype
- sys-boot/gnu-efi
- sys-boot/efibootmgr
- >=sys-libs/efivar-33
- x11-libs/cairo
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${DEPEND}
- sys-apps/dbus
-"
-
-PATCHES=(
- # https://github.com/fwupd/fwupd/issues/1770
- "${FILESDIR}"/${P}-report_uploading.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- $(meson_use agent)
- $(meson_use amt plugin_amt)
- $(meson_use consolekit)
- $(meson_use dell plugin_dell)
- $(meson_use elogind)
- $(meson_use gpg)
- $(meson_use gtk-doc gtkdoc)
- $(meson_use man)
- $(meson_use nvme plugin_nvme)
- $(meson_use pkcs7)
- $(meson_use redfish plugin_redfish)
- $(meson_use synaptics plugin_synaptics)
- $(meson_use systemd)
- $(meson_use test tests)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi)
- # Requires libflashrom which our sys-apps/flashrom
- # package does not provide
- -Dplugin_flashrom="false"
- # Dependencies are not available (yet?)
- -Dplugin_modem_manager="false"
- )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
- "${FILESDIR}"/${PN}-r1 \
- > "${T}"/${PN} || die
- doinitd "${T}"/${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- elog "In case you are using openrc as init system"
- elog "and you're upgrading from <fwupd-1.1.0, you"
- elog "need to start the fwupd daemon via the openrc"
- elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.4.1.ebuild b/sys-apps/fwupd/fwupd-1.4.1.ebuild
deleted file mode 100644
index fc4bbdbfe90..00000000000
--- a/sys-apps/fwupd/fwupd-1.4.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt consolekit dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( consolekit elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection?]
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- virtual/libelf:0=
- virtual/udev
- consolekit? ( >=sys-auth/consolekit-1.0.0 )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.4.0
- )
- elogind? ( sys-auth/elogind )
- !minimal? (
- >=sys-auth/polkit-0.103
- )
- nvme? ( sys-libs/efivar )
- redfish? ( sys-libs/efivar )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- app-crypt/tpm2-tss
- media-libs/fontconfig
- media-libs/freetype
- sys-boot/gnu-efi
- sys-boot/efibootmgr
- >=sys-libs/efivar-33
- x11-libs/cairo
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${DEPEND}
- sys-apps/dbus
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- $(meson_use agent)
- $(meson_use amt plugin_amt)
- $(meson_use consolekit)
- $(meson_use dell plugin_dell)
- $(meson_use elogind)
- $(meson_use gtk-doc gtkdoc)
- $(meson_use man)
- $(meson_use nvme plugin_nvme)
- $(meson_use redfish plugin_redfish)
- $(meson_use synaptics plugin_synaptics)
- $(meson_use systemd)
- $(meson_use test tests)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi)
- # Although our sys-apps/flashrom package now provides
- # libflashrom.a, meson still can't find it
- -Dplugin_flashrom="false"
- # Dependencies are not available (yet?)
- -Dplugin_modem_manager="false"
- )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
- "${FILESDIR}"/${PN}-r1 \
- > "${T}"/${PN} || die
- doinitd "${T}"/${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- elog "In case you are using openrc as init system"
- elog "and you're upgrading from <fwupd-1.1.0, you"
- elog "need to start the fwupd daemon via the openrc"
- elog "init script that comes with this package."
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2020-06-18 16:35 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2020-06-18 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 4fc968b0903d9f7c074b65d33f32ba553b4c49df
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 16:17:19 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 16:35:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc968b0
sys-apps/fwupd: Removed old
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 -
.../fwupd/files/fwupd-1.3.9-fwupdtool_path.patch | 20 ---
.../fwupd-1.3.9-optional_agent_man_page.patch | 57 -------
sys-apps/fwupd/fwupd-1.3.9-r1.ebuild | 166 ---------------------
4 files changed, 244 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a155d6738c3..79f3f3a7349 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,6 +1,5 @@
DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd
-DIST fwupd-1.3.9.tar.gz 2254260 BLAKE2B ead64be3eca00fd2d045fb6c5ccd42d8913fa056736e6ae039feef70b6edababe50fb0552db39bf057750d3f0d2224b18b7ecf5a5a408a1f1ac3023d89687f68 SHA512 b81ef1f683082e4c49ab8acd8848118fed1383d4e3e73967daaa68927e553a5bc4973004d3dd26b268b901c5deb1f9238a98537d24cfd957162f508c9622e1e4
DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e
DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
deleted file mode 100644
index a01e5fbe570..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 4e381f2a61c6ea4eb7438c14f76b8301762a800c Mon Sep 17 00:00:00 2001
-From: Dennis Kadioglu <dkadioglu@web.de>
-Date: Thu, 5 Mar 2020 09:37:56 +0100
-Subject: [PATCH] fix fwupd.shutdown.in according to the movement of fwupdtool
- to bindir
-
----
- data/fwupd.shutdown.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/fwupd.shutdown.in b/data/fwupd.shutdown.in
-index 4c027e7ab..53b334555 100755
---- a/data/fwupd.shutdown.in
-+++ b/data/fwupd.shutdown.in
-@@ -4,4 +4,4 @@
- [ -f @localstatedir@/lib/fwupd/pending.db ] || exit 0
-
- # activate firmware when we have a read-only filesysten
--@libexecdir@/fwupd/fwupdtool activate
-+@bindir@/fwupdtool activate
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
deleted file mode 100644
index 6c9898557ff..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 6 Mar 2020 16:00:23 +0100
-Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not
- requested
-
-Otherwise build fails with:
-
- src/meson.build:196:2: ERROR: Unknown variable "fwupdagent".
-
-Gentoo-bug: https://bugs.gentoo.org/711682
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/meson.build | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 46a9c4ded..e9aac607e 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -193,20 +193,22 @@ if build_daemon and get_option('man')
- install : true,
- install_dir : join_paths(mandir, 'man1'),
- )
-- custom_target('fwupdagent-man',
-- input : fwupdagent,
-- output : 'fwupdagent.1',
-- command : [
-- help2man, '@INPUT@',
-- '--no-info',
-- '--output', '@OUTPUT@',
-- '--name', 'Firmware updating agent',
-- '--manual', 'User Commands',
-- '--version-string', fwupd_version,
-- ],
-- install : true,
-- install_dir : join_paths(mandir, 'man1'),
-- )
-+ if get_option('agent')
-+ custom_target('fwupdagent-man',
-+ input : fwupdagent,
-+ output : 'fwupdagent.1',
-+ command : [
-+ help2man, '@INPUT@',
-+ '--no-info',
-+ '--output', '@OUTPUT@',
-+ '--name', 'Firmware updating agent',
-+ '--manual', 'User Commands',
-+ '--version-string', fwupd_version,
-+ ],
-+ install : true,
-+ install_dir : join_paths(mandir, 'man1'),
-+ )
-+ endif
- endif
- if get_option('man')
- custom_target('fwupdtool-man',
diff --git a/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild b/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild
deleted file mode 100644
index 9e00025905c..00000000000
--- a/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( consolekit elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection?]
- >=dev-libs/libxmlb-0.1.13
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- virtual/libelf:0=
- virtual/udev
- consolekit? ( >=sys-auth/consolekit-1.0.0 )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.4.0
- )
- elogind? ( sys-auth/elogind )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- !minimal? (
- >=sys-auth/polkit-0.103
- )
- nvme? ( sys-libs/efivar )
- pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
- redfish? ( sys-libs/efivar )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- app-crypt/tpm2-tss
- media-libs/fontconfig
- media-libs/freetype
- sys-boot/gnu-efi
- sys-boot/efibootmgr
- >=sys-libs/efivar-33
- x11-libs/cairo
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${DEPEND}
- sys-apps/dbus
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
- "${FILESDIR}/${P}-optional_agent_man_page.patch"
- "${FILESDIR}/${P}-fwupdtool_path.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- $(meson_use agent)
- $(meson_use amt plugin_amt)
- $(meson_use consolekit)
- $(meson_use dell plugin_dell)
- $(meson_use elogind)
- $(meson_use gpg)
- $(meson_use gtk-doc gtkdoc)
- $(meson_use man)
- $(meson_use nvme plugin_nvme)
- $(meson_use pkcs7)
- $(meson_use redfish plugin_redfish)
- $(meson_use synaptics plugin_synaptics)
- $(meson_use systemd)
- $(meson_use test tests)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi)
- # Requires libflashrom which our sys-apps/flashrom
- # package does not provide
- -Dplugin_flashrom="false"
- # Dependencies are not available (yet?)
- -Dplugin_modem_manager="false"
- )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
- "${FILESDIR}"/${PN}-r1 \
- > "${T}"/${PN} || die
- doinitd "${T}"/${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- elog "In case you are using openrc as init system"
- elog "and you're upgrading from <fwupd-1.1.0, you"
- elog "need to start the fwupd daemon via the openrc"
- elog "init script that comes with this package."
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2021-02-16 16:22 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2021-02-16 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 6c1a058f9086effdbd957abd9eaff021f970fee8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 16:10:08 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 16:22:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1a058f
sys-apps/fwupd: Bump to version 1.5.6
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch | 44 ++++++
sys-apps/fwupd/fwupd-1.5.6.ebuild | 169 +++++++++++++++++++++++
sys-apps/fwupd/metadata.xml | 2 +
4 files changed, 216 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 567e274eee7..f2308e9a897 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,4 @@
DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
DIST fwupd-1.5.4.tar.gz 2435897 BLAKE2B 23318f5305e3f2478c866e17e150ca3863e5eebf922e81f28a35541af4d9786dada8d2084e51b51e97343bdbf132e9b9981b8bb321ad4e76fba8c42b8b1e2e64 SHA512 961c9298e7672f720f4b6865d374b6066379f0a1c1a99356a9efd9359ee737cf9f9ab2c708f81505c971484d172b8dae96bc5f06be6e6f13c4a55604e6c346e7
DIST fwupd-1.5.5.tar.gz 2460482 BLAKE2B 79d1b34c07a0befe355e9a6c68770dfbbc575fd540802dd20ae4f65061d9fffd6245944e6f33b702539a5e88563afc7b4c619ca1507e31465dcf40138f92902f SHA512 a37f16b01e6700b0302293a916a379a89b574eed13f63577c19fa8b0ec396bd19f7f7d5c708085f3817af60fca65c02b0ddc4370de82104a5e8e65f583ff3f4a
+DIST fwupd-1.5.6.tar.gz 2480802 BLAKE2B ab9d9cffaf74b4ce6a9de47ef37aa05efae0c0b353f879eb3d0573fd4153c0893922c3a47b68188998752c2f9a75ca340ecb7af94e6c85890060f3826900f812 SHA512 6a04151b53c4446c15527f6b1396ba238b749c6f767dff4171849ccbdab8db2619fd1e3f0e146fd67681263621d55f20008709c7bac10a6d34f27f06c7118cfe
diff --git a/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch
new file mode 100644
index 00000000000..00c79d7853b
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch
@@ -0,0 +1,44 @@
+From c74992c62a32080208baf137d61f7d73b0cade2d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 16 Feb 2021 16:57:36 +0100
+Subject: [PATCH] system76-launch plugin requires gusb
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise the following build error happens:
+
+ ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:117:9: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function)
+ 117 | G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:133:11: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function)
+ 133 | G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---
+ plugins/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 138c47a4..12c7cb31 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -25,7 +25,6 @@ subdir('ata')
+ subdir('elantp')
+ subdir('optionrom')
+ subdir('superio')
+-subdir('system76-launch')
+ subdir('thelio-io')
+ subdir('wacom-raw')
+ endif
+@@ -59,6 +58,7 @@ subdir('solokey')
+ subdir('steelseries')
+ subdir('synaptics-cxaudio')
+ subdir('synaptics-prometheus')
++subdir('system76-launch')
+ subdir('vli')
+ subdir('wacom-usb')
+
+--
+2.30.1
+
diff --git a/sys-apps/fwupd/fwupd-1.5.6.ebuild b/sys-apps/fwupd/fwupd-1.5.6.ebuild
new file mode 100644
index 00000000000..891236d11e1
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.5.6.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="agent amt archive dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ minimal? ( !introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ introspection? ( dev-libs/gobject-introspection )
+ man? (
+ app-text/docbook-sgml-utils
+ sys-apps/help2man
+ )
+ test? (
+ thunderbolt? ( dev-util/umockdev )
+ net-libs/gnutls[tools]
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ dev-db/sqlite
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/json-glib
+ dev-libs/libgpg-error
+ dev-libs/libgudev:=
+ >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.1.13:=
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+ ')
+ >=net-libs/libsoup-2.51.92:2.4[introspection?]
+ net-misc/curl
+ virtual/libelf:0=
+ virtual/udev
+ archive? ( app-arch/libarchive:= )
+ dell? ( >=sys-libs/libsmbios-2.4.0 )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( net-libs/gnutls )
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+ policykit? ( >=sys-auth/polkit-0.103 )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss )
+ uefi? (
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-boot/gnu-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ x11-libs/cairo
+ )
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+ !<sci-chemistry/chemical-mime-data-0.1.94-r4
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+ "${FILESDIR}/${PN}-1.5.6-gusb_deps.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use nvme ; then
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+ fi
+}
+
+src_prepare() {
+ default
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+ sed '/platform-integrity/d' \
+ -i plugins/meson.build || die #753521
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ $(meson_use agent)
+ $(meson_use amt plugin_amt)
+ $(meson_use archive libarchive)
+ $(meson_use dell plugin_dell)
+ $(meson_use elogind)
+ $(meson_use flashrom plugin_flashrom)
+ $(meson_use gnutls)
+ $(meson_use gtk-doc gtkdoc)
+ $(meson_use gusb)
+ $(meson_use gusb plugin_altos)
+ $(meson_use man)
+ $(meson_use nvme plugin_nvme)
+ $(meson_use introspection)
+ $(meson_use policykit polkit)
+ $(meson_use synaptics plugin_synaptics_mst)
+ $(meson_use synaptics plugin_synaptics_rmi)
+ $(meson_use systemd)
+ $(meson_use test tests)
+ $(meson_use thunderbolt plugin_thunderbolt)
+ $(meson_use tpm)
+ $(meson_use uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_pk)
+ -Dconsolekit="false"
+ -Dcurl="true"
+ # Dependencies are not available (yet?)
+ -Dplugin_modem_manager="false"
+ )
+ use ppc64 && emesonargs+=( -Dplugin_msr="false" )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ sed "s@%SEAT_MANAGER%@elogind@" \
+ "${FILESDIR}"/${PN}-r1 \
+ > "${T}"/${PN} || die
+ doinitd "${T}"/${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "In case you are using openrc as init system"
+ elog "and you're upgrading from <fwupd-1.1.0, you"
+ elog "need to start the fwupd daemon via the openrc"
+ elog "init script that comes with this package."
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index c4fce7423fe..b2692d9a2fc 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -7,9 +7,11 @@
</maintainer>
<use>
<flag name="agent">Enable update notification agent</flag>
+ <flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
<flag name="amt">Build and install Intel AMT plugin</flag>
<flag name="dell">Enable Dell-specific support.</flag>
<flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
+ <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
<flag name="man">Build and install man pages</flag>
<flag name="nvme">Build and install NVMe plugin</flag>
<flag name="redfish">Install redfish plugin</flag>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2021-02-23 15:43 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2021-02-23 15:43 UTC (permalink / raw
To: gentoo-commits
commit: df62b1d39b11a2c4af0fa00c6851b99144f20b58
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 15:43:00 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 15:43:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df62b1d3
sys-apps/fwupd: Bump to version 1.5.7
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
.../fwupd/files/fwupd-1.5.7-logind_plugin.patch | 8 +
sys-apps/fwupd/fwupd-1.5.7.ebuild | 170 +++++++++++++++++++++
3 files changed, 179 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index e39e8a51788..3de6e25a138 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,4 @@
DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
DIST fwupd-1.5.5.tar.gz 2460482 BLAKE2B 79d1b34c07a0befe355e9a6c68770dfbbc575fd540802dd20ae4f65061d9fffd6245944e6f33b702539a5e88563afc7b4c619ca1507e31465dcf40138f92902f SHA512 a37f16b01e6700b0302293a916a379a89b574eed13f63577c19fa8b0ec396bd19f7f7d5c708085f3817af60fca65c02b0ddc4370de82104a5e8e65f583ff3f4a
DIST fwupd-1.5.6.tar.gz 2480802 BLAKE2B ab9d9cffaf74b4ce6a9de47ef37aa05efae0c0b353f879eb3d0573fd4153c0893922c3a47b68188998752c2f9a75ca340ecb7af94e6c85890060f3826900f812 SHA512 6a04151b53c4446c15527f6b1396ba238b749c6f767dff4171849ccbdab8db2619fd1e3f0e146fd67681263621d55f20008709c7bac10a6d34f27f06c7118cfe
+DIST fwupd-1.5.7.tar.gz 2498618 BLAKE2B ff0bf4d07a7df84232e90f5c85321dde3e08edd12f5ebf7a48130f076a52344e8654232bd0227d992fa5efbb3ce03e353da8b1511a9f39e5eab07c888b499463 SHA512 340a114123bd31a7a31370faaaa10e6517316d8f9c2b06f22d8b70bef64b7e6d9427682b8ceeea05570c8960eb7854ed5fc91aa450ff53d114fb97be43065213
diff --git a/sys-apps/fwupd/files/fwupd-1.5.7-logind_plugin.patch b/sys-apps/fwupd/files/fwupd-1.5.7-logind_plugin.patch
new file mode 100644
index 00000000000..7fbaf392e07
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.5.7-logind_plugin.patch
@@ -0,0 +1,8 @@
+--- fwupd-1.5.7/plugins/logind/meson.build
++++ fwupd-1.5.7/plugins/logind/meson.build
+@@ -1,4 +1,4 @@
+-if get_option('systemd')
++if get_option('systemd') or get_option('elogind')
+ if host_machine.system() != 'linux'
+ error('linux is required for systemd')
+ endif
diff --git a/sys-apps/fwupd/fwupd-1.5.7.ebuild b/sys-apps/fwupd/fwupd-1.5.7.ebuild
new file mode 100644
index 00000000000..5590327a535
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.5.7.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ minimal? ( !introspection )
+ uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ introspection? ( dev-libs/gobject-introspection )
+ man? (
+ app-text/docbook-sgml-utils
+ sys-apps/help2man
+ )
+ test? (
+ thunderbolt? ( dev-util/umockdev )
+ net-libs/gnutls[tools]
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ dev-db/sqlite
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/json-glib
+ dev-libs/libgpg-error
+ dev-libs/libgudev:=
+ >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.1.13:=
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+ ')
+ >=net-libs/libsoup-2.51.92:2.4[introspection?]
+ net-misc/curl
+ virtual/libelf:0=
+ virtual/udev
+ archive? ( app-arch/libarchive:= )
+ dell? ( >=sys-libs/libsmbios-2.4.0 )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( net-libs/gnutls )
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+ policykit? ( >=sys-auth/polkit-0.103 )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss )
+ uefi? (
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-boot/gnu-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ x11-libs/cairo
+ )
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+ !<sci-chemistry/chemical-mime-data-0.1.94-r4
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.5.7-logind_plugin.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use nvme ; then
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+ fi
+}
+
+src_prepare() {
+ default
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+ sed '/platform-integrity/d' \
+ -i plugins/meson.build || die #753521
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ $(meson_use agent)
+ $(meson_use amt plugin_amt)
+ $(meson_use archive libarchive)
+ $(meson_use bluetooth bluez)
+ $(meson_use dell plugin_dell)
+ $(meson_use elogind)
+ $(meson_use flashrom plugin_flashrom)
+ $(meson_use gnutls)
+ $(meson_use gtk-doc gtkdoc)
+ $(meson_use gusb)
+ $(meson_use gusb plugin_altos)
+ $(meson_use man)
+ $(meson_use nvme plugin_nvme)
+ $(meson_use introspection)
+ $(meson_use policykit polkit)
+ $(meson_use synaptics plugin_synaptics_mst)
+ $(meson_use synaptics plugin_synaptics_rmi)
+ $(meson_use systemd)
+ $(meson_use test tests)
+ $(meson_use thunderbolt plugin_thunderbolt)
+ $(meson_use tpm plugin_tpm)
+ $(meson_use uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_pk)
+ -Dconsolekit="false"
+ -Dcurl="true"
+ # Dependencies are not available (yet?)
+ -Dplugin_modem_manager="false"
+ )
+ use ppc64 && emesonargs+=( -Dplugin_msr="false" )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ sed "s@%SEAT_MANAGER%@elogind@" \
+ "${FILESDIR}"/${PN}-r1 \
+ > "${T}"/${PN} || die
+ doinitd "${T}"/${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "In case you are using openrc as init system"
+ elog "and you're upgrading from <fwupd-1.1.0, you"
+ elog "need to start the fwupd daemon via the openrc"
+ elog "init script that comes with this package."
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2021-05-20 9:10 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2021-05-20 9:10 UTC (permalink / raw
To: gentoo-commits
commit: e66d8e6015291d1d559a1cc2425556a45fb21c1f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 08:28:11 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 20 09:10:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66d8e60
sys-apps/fwupd: Removed useless sed call
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/files/fwupd-r2 | 2 +-
sys-apps/fwupd/fwupd-1.5.9.ebuild | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sys-apps/fwupd/files/fwupd-r2 b/sys-apps/fwupd/files/fwupd-r2
index c8994ddd841..d30bf1df08c 100644
--- a/sys-apps/fwupd/files/fwupd-r2
+++ b/sys-apps/fwupd/files/fwupd-r2
@@ -8,6 +8,6 @@ command="/usr/libexec/fwupd/fwupd"
command_background="true"
depend() {
- need %SEAT_MANAGER% dbus
+ need elogind dbus
before display-manager
}
diff --git a/sys-apps/fwupd/fwupd-1.5.9.ebuild b/sys-apps/fwupd/fwupd-1.5.9.ebuild
index 65bb1c747c5..c31e5bd7f8b 100644
--- a/sys-apps/fwupd/fwupd-1.5.9.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.9.ebuild
@@ -149,10 +149,7 @@ src_install() {
meson_src_install
if ! use minimal ; then
- sed "s@%SEAT_MANAGER%@elogind@" \
- "${FILESDIR}"/${PN}-r2 \
- > "${T}"/${PN} || die
- doinitd "${T}"/${PN}
+ doinitd "${FILESDIR}"/${PN}-r2
if ! use systemd ; then
# Don't timeout when fwupd is running (#673140)
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2021-05-20 9:10 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2021-05-20 9:10 UTC (permalink / raw
To: gentoo-commits
commit: 4d68708a8a651f5b2e12033799bb8c545f1c0ac2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 08:23:02 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 20 09:10:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d68708a
sys-apps/fwupd: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 3 -
.../fwupd/files/fwupd-1.3.9-logind_plugin.patch | 13 --
.../fwupd/files/fwupd-1.4.4-help2man_var.patch | 93 -----------
sys-apps/fwupd/fwupd-1.4.7.ebuild | 165 --------------------
sys-apps/fwupd/fwupd-1.4.8.ebuild | 164 --------------------
sys-apps/fwupd/fwupd-1.5.8.ebuild | 170 ---------------------
6 files changed, 608 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index f5369aa9669..540ebde7b0c 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,4 +1 @@
-DIST fwupd-1.4.7.tar.gz 2370660 BLAKE2B 8f04ced69610278576e41c12c7c51e326bdfbea8e1470ae586795b0c20f6a5fd4385701583195f49e14d749016987a7e02fb0d071b5315cca635f69d99bb63d6 SHA512 9d293adf6e9eba9537c4be9b7a4ccc26cd5519843f1bf94557148fabef8076e4846f7018949d8ad83afd01ce4874833bf8984c2ee3981fc6b1309ebda8e313f9
-DIST fwupd-1.4.8.tar.gz 2375361 BLAKE2B 14951c8ec7d59ec53fed7b98bf0e277a7544f04f72f6a827971d45f9996190ebd46767e373850b269d8d718ec8c2b9df41bdd44614e5065832bd21c4071f012a SHA512 25c49f5a814aaf5cd614074936f6a222c513a0e74446a48ddc19aa51fc3d3e9e79dfa77e9b80055a4e3755bca99f13d260c2e4ddf6853ba0a583162523fe7d47
-DIST fwupd-1.5.8.tar.gz 3708769 BLAKE2B e18738d5f681fd9016a609ce9d48e452628c32e731b2a1f3635ff4897ff2a910b1ca0d7836bd12f14b27254c23eb2b6d74a2c35939ac5c8484e2050ab89a33a3 SHA512 d4fecd13a223e7f544026a5ac684bd570af2b63fb509a21e98ef72ccc4d7818f32abf730e2a40943bc762f04ecd5af03bf71201518d55090bb95fe6e9dc6969e
DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch b/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch
deleted file mode 100644
index 526fe7700ed..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Enable logind plugin when -Delogind=true is set as well
-
---- fwupd-1.3.9/plugins/meson.build
-+++ fwupd-1.3.9/plugins/meson.build
-@@ -27,7 +27,7 @@
- subdir('wacom-raw')
- endif
-
--if get_option('systemd')
-+if get_option('systemd') or get_option('elogind')
- subdir('logind')
- endif
-
diff --git a/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch b/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch
deleted file mode 100644
index 818a69ddcd4..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 5164e713f620972b43c54e34a653a932c968e653 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@dell.com>
-Date: Thu, 18 Jun 2020 12:11:31 -0500
-Subject: [PATCH] trivial: fix issue with agent on but man off
-
-Fixes: #2192
----
- src/meson.build | 64 +++++++++++++++++++++++++------------------------
- 1 file changed, 33 insertions(+), 31 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 7a0b2976a..9a8334973 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -166,22 +166,24 @@ fwupdtool = executable(
- install_dir : bindir
- )
-
--if build_daemon and get_option('man')
-+if get_option('man')
- help2man = find_program('help2man')
-- custom_target('fwupdmgr-man',
-- input : fwupdmgr,
-- output : 'fwupdmgr.1',
-- command : [
-- help2man, '@INPUT@',
-- '--no-info',
-- '--output', '@OUTPUT@',
-- '--name', 'Firmware update manager client utility',
-- '--manual', 'User Commands',
-- '--version-string', fwupd_version,
-- ],
-- install : true,
-- install_dir : join_paths(mandir, 'man1'),
-- )
-+ if build_daemon
-+ custom_target('fwupdmgr-man',
-+ input : fwupdmgr,
-+ output : 'fwupdmgr.1',
-+ command : [
-+ help2man, '@INPUT@',
-+ '--no-info',
-+ '--output', '@OUTPUT@',
-+ '--name', 'Firmware update manager client utility',
-+ '--manual', 'User Commands',
-+ '--version-string', fwupd_version,
-+ ],
-+ install : true,
-+ install_dir : join_paths(mandir, 'man1'),
-+ )
-+ endif
- if get_option('agent')
- custom_target('fwupdagent-man',
- input : fwupdagent,
-@@ -198,22 +200,22 @@ if build_daemon and get_option('man')
- install_dir : join_paths(mandir, 'man1'),
- )
- endif
--endif
--if get_option('man')
-- custom_target('fwupdtool-man',
-- input : fwupdtool,
-- output : 'fwupdtool.1',
-- command : [
-- help2man, '@INPUT@',
-- '--no-info',
-- '--output', '@OUTPUT@',
-- '--name', 'Standalone firmware update utility',
-- '--manual', 'User Commands',
-- '--version-string', fwupd_version,
-- ],
-- install : true,
-- install_dir : join_paths(mandir, 'man1'),
-- )
-+ if build_standalone
-+ custom_target('fwupdtool-man',
-+ input : fwupdtool,
-+ output : 'fwupdtool.1',
-+ command : [
-+ help2man, '@INPUT@',
-+ '--no-info',
-+ '--output', '@OUTPUT@',
-+ '--name', 'Standalone firmware update utility',
-+ '--manual', 'User Commands',
-+ '--version-string', fwupd_version,
-+ ],
-+ install : true,
-+ install_dir : join_paths(mandir, 'man1'),
-+ )
-+ endif
- endif
-
- if build_daemon
diff --git a/sys-apps/fwupd/fwupd-1.4.7.ebuild b/sys-apps/fwupd/fwupd-1.4.7.ebuild
deleted file mode 100644
index f2da993af1f..00000000000
--- a/sys-apps/fwupd/fwupd-1.4.7.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- app-crypt/tpm2-tss
- net-libs/gnutls[tools]
- thunderbolt? ( dev-util/umockdev )
- )
-"
-CDEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection?]
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- virtual/libelf:0=
- virtual/udev
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.4.0
- )
- elogind? ( sys-auth/elogind )
- !minimal? (
- >=sys-auth/polkit-0.103
- )
- nvme? ( sys-libs/efivar )
- redfish? ( sys-libs/efivar )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- app-crypt/tpm2-tss
- media-libs/fontconfig
- media-libs/freetype
- sys-boot/gnu-efi
- sys-boot/efibootmgr
- >=sys-libs/efivar-33
- x11-libs/cairo
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${CDEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${CDEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
- "${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- $(meson_use agent)
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use elogind)
- $(meson_use gtk-doc gtkdoc)
- $(meson_use man)
- $(meson_use nvme plugin_nvme)
- $(meson_use introspection)
- $(meson_use redfish plugin_redfish)
- $(meson_use synaptics plugin_synaptics)
- $(meson_use systemd)
- $(meson_use test tests)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm tpm)
- $(meson_use uefi plugin_uefi)
- # Although our sys-apps/flashrom package now provides
- # libflashrom.a, meson still can't find it
- -Dplugin_flashrom="false"
- # Dependencies are not available (yet?)
- -Dplugin_modem_manager="false"
- -Dconsolekit="false"
- )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- sed "s@%SEAT_MANAGER%@elogind@" \
- "${FILESDIR}"/${PN}-r2 \
- > "${T}"/${PN} || die
- doinitd "${T}"/${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- elog "In case you are using openrc as init system"
- elog "and you're upgrading from <fwupd-1.1.0, you"
- elog "need to start the fwupd daemon via the openrc"
- elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.4.8.ebuild b/sys-apps/fwupd/fwupd-1.4.8.ebuild
deleted file mode 100644
index 3ec65898041..00000000000
--- a/sys-apps/fwupd/fwupd-1.4.8.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- net-libs/gnutls[tools]
- thunderbolt? ( dev-util/umockdev )
- )
-"
-CDEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection?]
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- virtual/libelf:0=
- virtual/udev
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.4.0
- )
- elogind? ( sys-auth/elogind )
- !minimal? (
- >=sys-auth/polkit-0.103
- )
- nvme? ( sys-libs/efivar )
- redfish? ( sys-libs/efivar )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- app-crypt/tpm2-tss
- media-libs/fontconfig
- media-libs/freetype
- sys-boot/gnu-efi
- sys-boot/efibootmgr
- >=sys-libs/efivar-33
- x11-libs/cairo
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${CDEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${CDEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
- "${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- $(meson_use agent)
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use elogind)
- $(meson_use gtk-doc gtkdoc)
- $(meson_use man)
- $(meson_use nvme plugin_nvme)
- $(meson_use introspection)
- $(meson_use redfish plugin_redfish)
- $(meson_use synaptics plugin_synaptics)
- $(meson_use systemd)
- $(meson_use test tests)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi)
- # Although our sys-apps/flashrom package now provides
- # libflashrom.a, meson still can't find it
- -Dplugin_flashrom="false"
- # Dependencies are not available (yet?)
- -Dplugin_modem_manager="false"
- -Dconsolekit="false"
- )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- sed "s@%SEAT_MANAGER%@elogind@" \
- "${FILESDIR}"/${PN}-r2 \
- > "${T}"/${PN} || die
- doinitd "${T}"/${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- elog "In case you are using openrc as init system"
- elog "and you're upgrading from <fwupd-1.1.0, you"
- elog "need to start the fwupd daemon via the openrc"
- elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.5.8.ebuild b/sys-apps/fwupd/fwupd-1.5.8.ebuild
deleted file mode 100644
index 5e5f2c55a63..00000000000
--- a/sys-apps/fwupd/fwupd-1.5.8.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- net-misc/curl
- virtual/libelf:0=
- virtual/udev
- archive? ( app-arch/libarchive:= )
- dell? ( >=sys-libs/libsmbios-2.4.0 )
- elogind? ( >=sys-auth/elogind-211 )
- flashrom? ( >=sys-apps/flashrom-1.2-r3 )
- gnutls? ( net-libs/gnutls )
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
- policykit? ( >=sys-auth/polkit-0.103 )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- media-libs/fontconfig
- media-libs/freetype
- sys-boot/gnu-efi
- sys-boot/efibootmgr
- sys-fs/udisks
- sys-libs/efivar
- x11-libs/cairo
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.7-logind_plugin.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme ; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
- sed '/platform-integrity/d' \
- -i plugins/meson.build || die #753521
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- $(meson_use agent)
- $(meson_use amt plugin_amt)
- $(meson_use archive libarchive)
- $(meson_use bluetooth bluez)
- $(meson_use dell plugin_dell)
- $(meson_use elogind)
- $(meson_use flashrom plugin_flashrom)
- $(meson_use gnutls)
- $(meson_use gtk-doc gtkdoc)
- $(meson_use gusb)
- $(meson_use gusb plugin_altos)
- $(meson_use man)
- $(meson_use nvme plugin_nvme)
- $(meson_use introspection)
- $(meson_use policykit polkit)
- $(meson_use synaptics plugin_synaptics_mst)
- $(meson_use synaptics plugin_synaptics_rmi)
- $(meson_use systemd)
- $(meson_use test tests)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_pk)
- -Dconsolekit="false"
- -Dcurl="true"
- # Dependencies are not available (yet?)
- -Dplugin_modem_manager="false"
- )
- use ppc64 && emesonargs+=( -Dplugin_msr="false" )
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- sed "s@%SEAT_MANAGER%@elogind@" \
- "${FILESDIR}"/${PN}-r2 \
- > "${T}"/${PN} || die
- doinitd "${T}"/${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- elog "In case you are using openrc as init system"
- elog "and you're upgrading from <fwupd-1.1.0, you"
- elog "need to start the fwupd daemon via the openrc"
- elog "init script that comes with this package."
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2021-05-20 9:11 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2021-05-20 9:11 UTC (permalink / raw
To: gentoo-commits
commit: 8fd93f03612e9a1e276b6bac65b51bd9bbdde3e3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 09:08:06 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 20 09:10:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd93f03
sys-apps/fwupd: Bump to version 1.6.0
Closes: https://bugs.gentoo.org/786147
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch | 53 +++++++
sys-apps/fwupd/fwupd-1.6.0.ebuild | 170 +++++++++++++++++++++++
sys-apps/fwupd/metadata.xml | 1 +
4 files changed, 225 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 540ebde7b0c..6f398a24c1c 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1 +1,2 @@
DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
+DIST fwupd-1.6.0.tar.gz 3747361 BLAKE2B 6368089db78a512048268ef3cb0333c75bb95b0f62d023e3db7c854c3362b88db1b1676cc24b9a4a5fe854e7dea6c727ec3d645476ee323a0dae16caf7028478 SHA512 0f2342fba95d635348c4b153887f2ea27e4bf49972558716143051ba79c39948487eb6cc15f938738d83aa3ea3eef5ae2854c9756a60f59f52ac859d35e2a669
diff --git a/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch
new file mode 100644
index 00000000000..92b8af9a70e
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch
@@ -0,0 +1,53 @@
+From 41f5294f1bfdfcbe96ed0d19ec79dc2f3cc24d36 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 20 May 2021 11:03:20 +0200
+Subject: [PATCH] analogix plugin requires gusb
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise the following build error happens:
+
+ ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:54:10: error: ‘G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE’ undeclared (first use in this function)
+ 54 | G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:54:10: note: each undeclared identifier is reported only once for each function it appears in
+ ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:55:10: error: ‘G_USB_DEVICE_REQUEST_TYPE_VENDOR’ undeclared (first use in this function)
+ 55 | G_USB_DEVICE_REQUEST_TYPE_VENDOR,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:56:10: error: ‘G_USB_DEVICE_RECIPIENT_DEVICE’ undeclared (first use in this function)
+ 56 | G_USB_DEVICE_RECIPIENT_DEVICE,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c: In function ‘fu_analogix_device_receive’:
+ ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:96:10: error: ‘G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST’ undeclared (first use in this function)
+ 96 | G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:97:10: error: ‘G_USB_DEVICE_REQUEST_TYPE_VENDOR’ undeclared (first use in this function)
+ 97 | G_USB_DEVICE_REQUEST_TYPE_VENDOR,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:98:10: error: ‘G_USB_DEVICE_RECIPIENT_DEVICE’ undeclared (first use in this function)
+ 98 | G_USB_DEVICE_RECIPIENT_DEVICE,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ and more...
+---
+ plugins/analogix/meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/analogix/meson.build b/plugins/analogix/meson.build
+index 1bfbbc33..c112d72d 100644
+--- a/plugins/analogix/meson.build
++++ b/plugins/analogix/meson.build
+@@ -1,3 +1,4 @@
++if get_option('gusb')
+ cargs = ['-DG_LOG_DOMAIN="FuPluginAnalogix"']
+
+ install_data(['analogix.quirk'],
+@@ -28,3 +29,4 @@ shared_module('fu_plugin_analogix',
+ plugin_deps,
+ ],
+ )
++endif
+--
+2.32.0.rc0
+
diff --git a/sys-apps/fwupd/fwupd-1.6.0.ebuild b/sys-apps/fwupd/fwupd-1.6.0.ebuild
new file mode 100644
index 00000000000..050554b92f3
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.6.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom lzma minimal introspection +man nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ minimal? ( !introspection )
+ spi? ( lzma )
+ synaptics? ( gnutls )
+ uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ introspection? ( dev-libs/gobject-introspection )
+ man? (
+ app-text/docbook-sgml-utils
+ sys-apps/help2man
+ )
+ test? (
+ thunderbolt? ( dev-util/umockdev )
+ net-libs/gnutls[tools]
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ dev-db/sqlite
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/json-glib
+ dev-libs/libgpg-error
+ dev-libs/libgudev:=
+ >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.1.13:=
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+ ')
+ >=net-libs/libsoup-2.51.92:2.4[introspection?]
+ net-misc/curl
+ virtual/libelf:0=
+ virtual/udev
+ archive? ( app-arch/libarchive:= )
+ dell? ( >=sys-libs/libsmbios-2.4.0 )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( net-libs/gnutls )
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+ lzma? ( app-arch/xz-utils )
+ policykit? ( >=sys-auth/polkit-0.103 )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss )
+ uefi? (
+ sys-boot/gnu-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ )
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+ !<sci-chemistry/chemical-mime-data-0.1.94-r4
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.5.7-logind_plugin.patch"
+ "${FILESDIR}/${PN}-1.6.0-gusb_deps.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use nvme ; then
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+ fi
+}
+
+src_prepare() {
+ default
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+ sed '/platform-integrity/d' \
+ -i plugins/meson.build || die #753521
+ vala_src_prepare
+}
+
+src_configure() {
+ local plugins=(
+ $(meson_use amt plugin_amt)
+ $(meson_use dell plugin_dell)
+ $(meson_use flashrom plugin_flashrom)
+ $(meson_use gusb plugin_altos)
+ $(meson_use nvme plugin_nvme)
+ $(meson_use spi plugin_intel_spi)
+ $(meson_use synaptics plugin_synaptics_mst)
+ $(meson_use synaptics plugin_synaptics_rmi)
+ $(meson_use thunderbolt plugin_thunderbolt)
+ $(meson_use tpm plugin_tpm)
+ $(meson_use uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_capsule_splash)
+ $(meson_use uefi plugin_uefi_pk)
+
+ # Dependencies are not available (yet?)
+ -Dplugin_modem_manager="false"
+ )
+ use ppc64 && plugins+=( -Dplugin_msr="false" )
+
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ $(meson_use agent)
+ $(meson_use archive libarchive)
+ $(meson_use bluetooth bluez)
+ $(meson_use elogind)
+ $(meson_use gnutls)
+ $(meson_use gtk-doc gtkdoc)
+ $(meson_use gusb)
+ $(meson_use lzma)
+ $(meson_use man)
+ $(meson_use introspection)
+ $(meson_use policykit polkit)
+ $(meson_use systemd)
+ $(meson_use test tests)
+ $(meson_use uefi efi_binary)
+ -Dconsolekit="false"
+ -Dcurl="true"
+
+ ${plugins[@]}
+ )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ doinitd "${FILESDIR}"/${PN}-r2
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 46f6584e263..c41161f4abc 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -14,6 +14,7 @@
<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
<flag name="nvme">Build and install NVMe plugin</flag>
<flag name="redfish">Install redfish plugin</flag>
+ <flag name="spi">Install Intel-SPI plugin</flag>
<flag name="synaptics">Install synaptics plugin</flag>
<flag name="thunderbolt">Install Thunderbolt plugin</flag>
<flag name="tpm">Install Trusted Platform Module plugin</flag>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2021-06-15 23:04 Thomas Deutschmann
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Deutschmann @ 2021-06-15 23:04 UTC (permalink / raw
To: gentoo-commits
commit: a982662f154a3e128f5e9d661bf3f84ba3bd4a30
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 22:42:36 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 22:53:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a982662f
sys-apps/fwupd: pull in sys-apps/fwupd-efi
Closes: https://bugs.gentoo.org/791835
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 -
sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch | 53 -------
sys-apps/fwupd/fwupd-1.6.0-r1.ebuild | 171 ---------------------
.../{fwupd-1.6.1.ebuild => fwupd-1.6.1-r1.ebuild} | 2 +-
4 files changed, 1 insertion(+), 226 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 5d6d529b44d..655646df514 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,2 @@
DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
-DIST fwupd-1.6.0.tar.gz 3747361 BLAKE2B 6368089db78a512048268ef3cb0333c75bb95b0f62d023e3db7c854c3362b88db1b1676cc24b9a4a5fe854e7dea6c727ec3d645476ee323a0dae16caf7028478 SHA512 0f2342fba95d635348c4b153887f2ea27e4bf49972558716143051ba79c39948487eb6cc15f938738d83aa3ea3eef5ae2854c9756a60f59f52ac859d35e2a669
DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c
diff --git a/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch
deleted file mode 100644
index 92b8af9a70e..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 41f5294f1bfdfcbe96ed0d19ec79dc2f3cc24d36 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 20 May 2021 11:03:20 +0200
-Subject: [PATCH] analogix plugin requires gusb
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise the following build error happens:
-
- ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:54:10: error: ‘G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE’ undeclared (first use in this function)
- 54 | G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:54:10: note: each undeclared identifier is reported only once for each function it appears in
- ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:55:10: error: ‘G_USB_DEVICE_REQUEST_TYPE_VENDOR’ undeclared (first use in this function)
- 55 | G_USB_DEVICE_REQUEST_TYPE_VENDOR,
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:56:10: error: ‘G_USB_DEVICE_RECIPIENT_DEVICE’ undeclared (first use in this function)
- 56 | G_USB_DEVICE_RECIPIENT_DEVICE,
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c: In function ‘fu_analogix_device_receive’:
- ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:96:10: error: ‘G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST’ undeclared (first use in this function)
- 96 | G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:97:10: error: ‘G_USB_DEVICE_REQUEST_TYPE_VENDOR’ undeclared (first use in this function)
- 97 | G_USB_DEVICE_REQUEST_TYPE_VENDOR,
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:98:10: error: ‘G_USB_DEVICE_RECIPIENT_DEVICE’ undeclared (first use in this function)
- 98 | G_USB_DEVICE_RECIPIENT_DEVICE,
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- and more...
----
- plugins/analogix/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/analogix/meson.build b/plugins/analogix/meson.build
-index 1bfbbc33..c112d72d 100644
---- a/plugins/analogix/meson.build
-+++ b/plugins/analogix/meson.build
-@@ -1,3 +1,4 @@
-+if get_option('gusb')
- cargs = ['-DG_LOG_DOMAIN="FuPluginAnalogix"']
-
- install_data(['analogix.quirk'],
-@@ -28,3 +29,4 @@ shared_module('fu_plugin_analogix',
- plugin_deps,
- ],
- )
-+endif
---
-2.32.0.rc0
-
diff --git a/sys-apps/fwupd/fwupd-1.6.0-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.0-r1.ebuild
deleted file mode 100644
index ed555c82411..00000000000
--- a/sys-apps/fwupd/fwupd-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom lzma minimal introspection +man nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
- spi? ( lzma )
- synaptics? ( gnutls )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- net-misc/curl
- virtual/libelf:0=
- virtual/udev
- archive? ( app-arch/libarchive:= )
- dell? ( >=sys-libs/libsmbios-2.4.0 )
- elogind? ( >=sys-auth/elogind-211 )
- flashrom? ( >=sys-apps/flashrom-1.2-r3 )
- gnutls? ( net-libs/gnutls )
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
- lzma? ( app-arch/xz-utils )
- policykit? ( >=sys-auth/polkit-0.103 )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- sys-boot/gnu-efi
- sys-boot/efibootmgr
- sys-fs/udisks
- sys-libs/efivar
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.7-logind_plugin.patch"
- "${FILESDIR}/${PN}-1.6.0-gusb_deps.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme ; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
- sed '/platform-integrity/d' \
- -i plugins/meson.build || die #753521
- vala_src_prepare
-}
-
-src_configure() {
- local plugins=(
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use flashrom plugin_flashrom)
- $(meson_use gusb plugin_altos)
- $(meson_use nvme plugin_nvme)
- $(meson_use spi plugin_intel_spi)
- $(meson_use synaptics plugin_synaptics_mst)
- $(meson_use synaptics plugin_synaptics_rmi)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_use uefi plugin_uefi_pk)
-
- # Dependencies are not available (yet?)
- -Dplugin_modem_manager="false"
- )
- use ppc64 && plugins+=( -Dplugin_msr="false" )
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="false"
- -Dcurl="true"
- -Defi_binary="false"
- -Dsupported_build="true"
- $(meson_use agent)
- $(meson_use archive libarchive)
- $(meson_use bluetooth bluez)
- $(meson_use elogind)
- $(meson_use gnutls)
- $(meson_use gtk-doc gtkdoc)
- $(meson_use gusb)
- $(meson_use lzma)
- $(meson_use man)
- $(meson_use introspection)
- $(meson_use policykit polkit)
- $(meson_use systemd)
- $(meson_use test tests)
-
- ${plugins[@]}
- )
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
diff --git a/sys-apps/fwupd/fwupd-1.6.1.ebuild b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
similarity index 99%
rename from sys-apps/fwupd/fwupd-1.6.1.ebuild
rename to sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
index 5468692f74b..cad45969bcb 100644
--- a/sys-apps/fwupd/fwupd-1.6.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
@@ -67,7 +67,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
systemd? ( >=sys-apps/systemd-211 )
tpm? ( app-crypt/tpm2-tss )
uefi? (
- sys-boot/gnu-efi
+ sys-apps/fwupd-efi
sys-boot/efibootmgr
sys-fs/udisks
sys-libs/efivar
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2021-06-15 23:04 Thomas Deutschmann
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Deutschmann @ 2021-06-15 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 663a25c8d581d31ef58930aea642af90bbf1bdc8
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 22:45:53 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 22:53:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663a25c8
sys-apps/fwupd: switch to upstream patch
Bug: https://bugs.gentoo.org/796143
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../files/fwupd-1.6.1-fix-python-detection.patch | 51 ++++++++++++++++++++++
...-revert-Change-python-version-check-order.patch | 25 -----------
sys-apps/fwupd/fwupd-1.6.1-r1.ebuild | 2 +-
3 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch b/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch
new file mode 100644
index 00000000000..b5da660e643
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch
@@ -0,0 +1,51 @@
+From 1a53fc57e8b5cd2de571ad5f1119c90ac8082f7a Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <superm1@gmail.com>
+Date: Tue, 15 Jun 2021 08:10:06 -0500
+Subject: [PATCH 1/2] Revert "meson.build: Change python version check order"
+
+This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1f89e6070..0ae12a1a7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -252,7 +252,7 @@ libm = cc.find_library('m', required: false)
+ libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
+ gcab = find_program('gcab', required : get_option('tests'))
+ bashcomp = dependency('bash-completion', required: false)
+-python3 = find_program('python3.8', 'python3', 'python3.9')
++python3 = find_program('python3')
+
+ if get_option('gnutls')
+ gnutls = dependency('gnutls', version : '>= 3.6.0')
+
+From f4ef486da80a3b5916f8a58f10a70f30cf05f756 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <superm1@gmail.com>
+Date: Tue, 15 Jun 2021 08:13:17 -0500
+Subject: [PATCH 2/2] trivial: fix a regression in Gentoo detecting python
+ versions
+
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 0ae12a1a7..6e09ac69b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -252,7 +252,11 @@ libm = cc.find_library('m', required: false)
+ libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
+ gcab = find_program('gcab', required : get_option('tests'))
+ bashcomp = dependency('bash-completion', required: false)
+-python3 = find_program('python3')
++if host_machine.system() != 'freebsd'
++ python3 = find_program('python3')
++else
++ python3 = find_program('python3.8', 'python3', 'python3.9')
++endif
+
+ if get_option('gnutls')
+ gnutls = dependency('gnutls', version : '>= 3.6.0')
diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch b/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
deleted file mode 100644
index d1c1b140830..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 72a470fd607a40e8f23c1f2407faf69e91350783
-Author: Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Tue Jun 15 14:11:24 2021 +0200
-Commit: Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Tue Jun 15 14:11:24 2021 +0200
-
- Revert "meson.build: Change python version check order"
-
- This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9.
-
- This is causing a regression for Gentoo, https://bugs.gentoo.org/796143.
-
-diff --git a/meson.build b/meson.build
-index 5d507515..1e0e350a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -252,7 +252,7 @@ libm = cc.find_library('m', required: false)
- libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
- gcab = find_program('gcab', required : get_option('tests'))
- bashcomp = dependency('bash-completion', required: false)
--python3 = find_program('python3.8', 'python3', 'python3.9')
-+python3 = find_program('python3')
-
- if get_option('gnutls')
- gnutls = dependency('gnutls', version : '>= 3.6.0')
diff --git a/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
index cad45969bcb..e258342be62 100644
--- a/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
@@ -87,7 +87,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
- "${FILESDIR}"/${PN}-1.6.1-revert-Change-python-version-check-order.patch
+ "${FILESDIR}"/${P}-fix-python-detection.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2021-10-15 14:33 Thomas Deutschmann
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Deutschmann @ 2021-10-15 14:33 UTC (permalink / raw
To: gentoo-commits
commit: b63eeb5988488c15b4a633b6781999c50669613f
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 15 13:54:12 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 15 14:32:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63eeb59
sys-apps/fwupd: bump to v1.7.0
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
.../files/fwupd-1.7.0-elanfp-requires-gusb.patch | 22 +++
sys-apps/fwupd/fwupd-1.7.0.ebuild | 178 +++++++++++++++++++++
sys-apps/fwupd/metadata.xml | 1 +
4 files changed, 202 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index f73af45bdb6..576bc66efdd 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,3 +2,4 @@ DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6a
DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
+DIST fwupd-1.7.0.tar.gz 4102985 BLAKE2B 9a29621e029c526d513304863294ee69f14ff1cf069b388fe5dc6037b2f030ea24136f18d9096abcc449376295996e3184c1c969f8dda329f2786622ba1300a7 SHA512 148f161f0e8d008fa20091c747baf4a205bc2e76ddc5dbb3676e3f2a15ca5d6d1454b572ea0336f185b5ef3a8ca8bfd3ad1098649e095a58c9822d4dbffe2987
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
new file mode 100644
index 00000000000..fec6aab4a3c
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
@@ -0,0 +1,22 @@
+commit fa403db414301c247aef1bc895795a04b06d9298
+Author: Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Fri Oct 15 15:45:55 2021 +0200
+Commit: Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Fri Oct 15 15:45:55 2021 +0200
+
+ elanfp plugin requires gusb
+
+diff --git a/plugins/elanfp/meson.build b/plugins/elanfp/meson.build
+index e8bb8255..2b5d7fde 100644
+--- a/plugins/elanfp/meson.build
++++ b/plugins/elanfp/meson.build
+@@ -1,3 +1,4 @@
++if get_option('gusb')
+ cargs = ['-DG_LOG_DOMAIN="FuPluginElanfp"']
+
+ install_data(['elanfp.quirk'],
+@@ -27,3 +28,4 @@ shared_module('fu_plugin_elanfp',
+ plugin_deps,
+ ],
+ )
++endif
diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
new file mode 100644
index 00000000000..2e580029d43
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.7.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info meson python-single-r1 vala xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ minimal? ( !introspection )
+ spi? ( lzma )
+ synaptics? ( gnutls )
+ uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ introspection? ( dev-libs/gobject-introspection )
+ man? (
+ app-text/docbook-sgml-utils
+ sys-apps/help2man
+ )
+ test? (
+ thunderbolt? ( dev-util/umockdev )
+ net-libs/gnutls[tools]
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ dev-db/sqlite
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/json-glib
+ dev-libs/libgpg-error
+ dev-libs/libgudev:=
+ >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.1.13:=[introspection?]
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ ')
+ >=net-libs/libsoup-2.51.92:2.4[introspection?]
+ net-misc/curl
+ virtual/libelf:0=
+ virtual/udev
+ archive? ( app-arch/libarchive:= )
+ dell? ( >=sys-libs/libsmbios-2.4.0 )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( net-libs/gnutls )
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+ logitech? ( dev-libs/protobuf-c:= )
+ lzma? ( app-arch/xz-utils )
+ modemmanager? ( net-misc/modemmanager[qmi] )
+ policykit? ( >=sys-auth/polkit-0.103 )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss )
+ uefi? (
+ sys-apps/fwupd-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ )
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+ !<sci-chemistry/chemical-mime-data-0.1.94-r4
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
+ "${FILESDIR}"/${P}-elanfp-requires-gusb.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use nvme ; then
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+ fi
+}
+
+src_prepare() {
+ default
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+
+ sed -e '/platform-integrity/d' \
+ -i plugins/meson.build || die #753521
+
+ sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+ -i data/builder/meson.build || die
+
+ vala_src_prepare
+}
+
+src_configure() {
+ local plugins=(
+ $(meson_use amt plugin_amt)
+ $(meson_use dell plugin_dell)
+ $(meson_use flashrom plugin_flashrom)
+ $(meson_use gusb plugin_altos)
+ $(meson_use logitech plugin_logitech_bulkcontroller)
+ $(meson_use modemmanager plugin_modem_manager)
+ $(meson_use nvme plugin_nvme)
+ $(meson_use spi plugin_intel_spi)
+ $(meson_use synaptics plugin_synaptics_mst)
+ $(meson_use synaptics plugin_synaptics_rmi)
+ $(meson_use thunderbolt plugin_thunderbolt)
+ $(meson_use tpm plugin_tpm)
+ $(meson_use uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_capsule_splash)
+ $(meson_use uefi plugin_uefi_pk)
+ )
+ use ppc64 && plugins+=( -Dplugin_msr="false" )
+ use riscv && plugins+=( -Dplugin_msr="false" )
+
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ -Dconsolekit="false"
+ -Dcurl="true"
+ -Ddocs="$(usex gtk-doc gtkdoc none)"
+ -Defi_binary="false"
+ -Dsupported_build="true"
+ $(meson_use agent)
+ $(meson_use archive libarchive)
+ $(meson_use bluetooth bluez)
+ $(meson_use elogind)
+ $(meson_use gnutls)
+ $(meson_use gusb)
+ $(meson_use lzma)
+ $(meson_use man)
+ $(meson_use introspection)
+ $(meson_use policykit polkit)
+ $(meson_use systemd)
+ $(meson_use test tests)
+
+ ${plugins[@]}
+ )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 4d30edc6fd6..d1dfe55c1e5 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -16,6 +16,7 @@
<flag name="dell">Enable Dell-specific support.</flag>
<flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
+ <flag name="logitech">Build and install Logitech bulk controller plugin</flag>
<flag name="nvme">Build and install NVMe plugin</flag>
<flag name="modemmanager">Build and install Modem Manager plugin</flag>
<flag name="spi">Install Intel-SPI plugin</flag>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2022-02-28 9:46 Lars Wendler
0 siblings, 0 replies; 28+ messages in thread
From: Lars Wendler @ 2022-02-28 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 5384be291948c734f441e772b1f1933c578dc13f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 09:44:27 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 09:46:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5384be29
sys-apps/fwupd: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 -
sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch | 55 --------
sys-apps/fwupd/fwupd-1.7.4.ebuild | 178 ------------------------
3 files changed, 234 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index b613b94ed5da..c7fc8c92a4c5 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,4 +1,3 @@
DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521
-DIST fwupd-1.7.4.tar.gz 4002584 BLAKE2B 6d01ee3993cc2a55164fd6ae468c00430fdc63b737abbad3dd279ef061625de4e2540d76b7069757753a9e94c1afc3635b565a25758c9d616e0d467212fd4751 SHA512 fa7195e2873a55fe544636c639597b4b2bac0855b10df4fac075ce377b87ae2aa2ccd86fb173379d39ebff542acca33e97234fd6c946e12b212dcf88b5f378a1
DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31
DIST fwupd-1.7.6.tar.gz 4054269 BLAKE2B dea4a37aea406e933f312fb809ee2ea972e3b017e5267d51bed835b6d440c15ca1d589f76a6c1906e616acc7cdd6c0f6dcec034e1460427057d8a1168583c4ce SHA512 f04ee78a6ec9e73ce0f3eb9c2dcbfc471ac88264451a378f1b0010fa528596052b4d3a63f5303074dd4fad55bf153fe5642d77adebd4ed805d74f57fbbff5b2b
diff --git a/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch b/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch
deleted file mode 100644
index 968a0e7222d3..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From e74d38bfd3097471fe60dbe843a68c16516a78da Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 17 Jan 2022 14:50:47 +0000
-Subject: [PATCH] Fix compiling with new versions of efivar
-
-Fixes https://github.com/fwupd/fwupd/issues/4181
----
- meson.build | 5 +++++
- plugins/uefi-capsule/fu-uefi-common.h | 3 +++
- 2 files changed, 8 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 833bdbf56..691cc8a58 100644
---- a/meson.build
-+++ b/meson.build
-@@ -412,6 +412,11 @@ endif
- if build_standalone and get_option('plugin_uefi_capsule')
- efiboot = dependency('efiboot')
-
-+ efivar = dependency('efivar')
-+ if cc.has_header_symbol('efivar/efivar-types.h', 'efi_time_t', dependencies : efivar)
-+ conf.set('HAVE_EFI_TIME_T', '1')
-+ endif
-+
- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
- conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
-
-diff --git a/plugins/uefi-capsule/fu-uefi-common.h b/plugins/uefi-capsule/fu-uefi-common.h
-index a21806d6b..1d616c9e0 100644
---- a/plugins/uefi-capsule/fu-uefi-common.h
-+++ b/plugins/uefi-capsule/fu-uefi-common.h
-@@ -9,6 +9,7 @@
-
- #include <fwupdplugin.h>
-
-+#include <efivar/efivar.h>
- #include <glib.h>
-
- #define EFI_CAPSULE_HEADER_FLAGS_PERSIST_ACROSS_RESET 0x00010000
-@@ -17,6 +18,7 @@
-
- #define EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED 0x0000000000000004ULL
-
-+#ifndef HAVE_EFI_TIME_T
- typedef struct __attribute__((__packed__)) {
- guint16 year;
- guint8 month;
-@@ -30,6 +32,7 @@ typedef struct __attribute__((__packed__)) {
- guint8 daylight;
- guint8 pad2;
- } efi_time_t;
-+#endif
-
- typedef struct __attribute__((__packed__)) {
- fwupd_guid_t guid;
diff --git a/sys-apps/fwupd/fwupd-1.7.4.ebuild b/sys-apps/fwupd/fwupd-1.7.4.ebuild
deleted file mode 100644
index aaed0839779c..000000000000
--- a/sys-apps/fwupd/fwupd-1.7.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- fastboot? ( gusb )
- logitech? ( gusb )
- minimal? ( !introspection )
- spi? ( lzma )
- synaptics? ( gnutls )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- bash-completion? ( >=app-shells/bash-completion-2.0 )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- app-arch/xz-utils
- >=dev-libs/glib-2.58:2
- dev-libs/json-glib
- dev-libs/libgudev:=
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=[introspection?]
- $(python_gen_cond_dep '
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- net-misc/curl
- archive? ( app-arch/libarchive:= )
- dell? ( >=sys-libs/libsmbios-2.4.0 )
- elogind? ( >=sys-auth/elogind-211 )
- flashrom? ( >=sys-apps/flashrom-1.2-r3 )
- gnutls? ( net-libs/gnutls )
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
- logitech? ( dev-libs/protobuf-c:= )
- lzma? ( app-arch/xz-utils )
- modemmanager? ( net-misc/modemmanager[qmi] )
- policykit? ( >=sys-auth/polkit-0.103 )
- sqlite? ( dev-db/sqlite )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- sys-apps/fwupd-efi
- sys-boot/efibootmgr
- sys-fs/udisks
- sys-libs/efivar
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.7.4-efivar38.patch" #831327
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme ; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
-
- sed -e '/platform-integrity/d' \
- -i plugins/meson.build || die #753521
-
- sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
- -i data/builder/meson.build || die
-
- vala_src_prepare
-}
-
-src_configure() {
- local plugins=(
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use fastboot plugin_fastboot)
- $(meson_use flashrom plugin_flashrom)
- $(meson_use gusb plugin_uf2)
- $(meson_use logitech plugin_logitech_bulkcontroller)
- $(meson_use modemmanager plugin_modem_manager)
- $(meson_use nvme plugin_nvme)
- $(meson_use sqlite)
- $(meson_use spi plugin_intel_spi)
- $(meson_use synaptics plugin_synaptics_mst)
- $(meson_use synaptics plugin_synaptics_rmi)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_use uefi plugin_uefi_pk)
- )
- use ppc64 && plugins+=( -Dplugin_msr="false" )
- use riscv && plugins+=( -Dplugin_msr="false" )
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="false"
- -Dcurl="true"
- -Ddocs="$(usex gtk-doc gtkdoc none)"
- -Defi_binary="false"
- -Dsupported_build="true"
- $(meson_use archive libarchive)
- $(meson_use bash-completion bash_completion)
- $(meson_use bluetooth bluez)
- $(meson_use elogind)
- $(meson_use gnutls)
- $(meson_use gusb)
- $(meson_use lzma)
- $(meson_use man)
- $(meson_use introspection)
- $(meson_use policykit polkit)
- $(meson_use systemd)
- $(meson_use test tests)
-
- ${plugins[@]}
- )
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2022-08-31 13:24 Marek Szuba
0 siblings, 0 replies; 28+ messages in thread
From: Marek Szuba @ 2022-08-31 13:24 UTC (permalink / raw
To: gentoo-commits
commit: b2a24c43c431b163fda4a7eb1b982ad43a8187e5
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 13:20:38 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 13:24:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a24c43
sys-apps/fwupd: add 1.8.4
Closes: https://bugs.gentoo.org/867616
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
.../fwupd/files/fwupd-1.8.4-installed_tests.patch | 215 +++++++++++++++++++++
sys-apps/fwupd/fwupd-1.8.4.ebuild | 201 +++++++++++++++++++
3 files changed, 417 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 060c1b5fe73c..7fc645626c16 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,2 +1,3 @@
DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
DIST fwupd-1.8.3.tar.gz 4267315 BLAKE2B 35e5855ea0d314fa5b1cc33ed4efa71e54c35b57c742748a5d6c7f4c1f88bfd9c2e5a84f2af72f6e5e63ddfc4f6521312fb7b1446922c76917f9abdd4d90e618 SHA512 271a1c2547f35322a7a7d83adc84d729ba73d810f6ac526d1c6aa2a9774dea1edc986b7d62481ebb70d43653577ced19f13f695dedf4012c82d814da70cb83f4
+DIST fwupd-1.8.4.tar.xz 3269648 BLAKE2B 20857c5de6194a561c587ace0463d94440d25256a04cce51b77f3dcffde9b0f08a03a03e1d0dbb5f15016169f9a31e290609b3fc3f68b40b932c77335f05ec6f SHA512 569d0cb81f9a29259d0a7ae7100ca1063d20557b56903f80c1466667baf40a74d677f48159e5bd53ab6b33de8ce7185bf279b6dbcf6edfee744c1d4965c5db8f
diff --git a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
new file mode 100644
index 000000000000..1cb3b41cb728
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
@@ -0,0 +1,215 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -10,20 +10,10 @@
+ subdir('fish-completion')
+ endif
+
+-if get_option('tests')
+-subdir('device-tests')
+-endif
+-
+ if build_daemon
+ subdir('motd')
+ endif
+
+-if get_option('tests')
+- if build_daemon
+- subdir('installed-tests')
+- endif
+-endif
+-
+ if build_standalone
+ install_data(['daemon.conf'],
+ install_dir: join_paths(sysconfdir, 'fwupd')
+--- a/plugins/acpi-dmar/meson.build
++++ b/plugins/acpi-dmar/meson.build
+@@ -47,7 +47,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-dmar-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-facp/meson.build
++++ b/plugins/acpi-facp/meson.build
+@@ -47,7 +47,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-facp-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-ivrs/meson.build
++++ b/plugins/acpi-ivrs/meson.build
+@@ -47,7 +47,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-ivrs-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-phat/meson.build
++++ b/plugins/acpi-phat/meson.build
+@@ -53,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-phat-self-test', e, env: env) # added to installed-tests
+--- a/plugins/ata/meson.build
++++ b/plugins/ata/meson.build
+@@ -53,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('ata-self-test', e, env: env) # added to installed-tests
+--- a/plugins/bcm57xx/meson.build
++++ b/plugins/bcm57xx/meson.build
+@@ -35,8 +35,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/bcm57xx.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -63,7 +61,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('bcm57xx-self-test', e, env: env)
+--- a/plugins/ccgx/meson.build
++++ b/plugins/ccgx/meson.build
+@@ -37,8 +37,6 @@
+ endif
+
+ if get_option('tests')
+- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -64,7 +62,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('ccgx-self-test', e, env: env)
+--- a/plugins/elantp/meson.build
++++ b/plugins/elantp/meson.build
+@@ -33,8 +33,6 @@
+ endif
+
+ if get_option('tests')
+- install_data(['tests/elantp.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -57,7 +55,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('elantp-self-test', e, env: env)
+--- a/plugins/linux-swap/meson.build
++++ b/plugins/linux-swap/meson.build
+@@ -44,7 +44,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('linux-swap-self-test', e) # added to installed-tests
+--- a/plugins/mtd/meson.build
++++ b/plugins/mtd/meson.build
+@@ -46,7 +46,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('mtd-self-test', e) # added to installed-tests
+--- a/plugins/nitrokey/meson.build
++++ b/plugins/nitrokey/meson.build
+@@ -47,7 +47,6 @@
+ link_with: [
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('nitrokey-self-test', e) # added to installed-tests
+--- a/plugins/pixart-rf/meson.build
++++ b/plugins/pixart-rf/meson.build
+@@ -31,8 +31,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/pixart.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -55,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('pxi-self-test', e, env: env)
+--- a/plugins/redfish/meson.build
++++ b/plugins/redfish/meson.build
+@@ -47,14 +47,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/redfish-smbios.bin'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/redfish.conf'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -89,7 +81,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('redfish-self-test', e, env: env) # added to installed-tests
+--- a/src/tests/host-emulate/meson.build
++++ b/src/tests/host-emulate/meson.build
+@@ -8,7 +8,7 @@
+ output: '@0@.gz'.format(input_file),
+ capture: true,
+ command: [gzip, '-k', '--stdout', '@INPUT@'],
+- install: true,
++ install: false,
+ install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
+ )
+ endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.4.ebuild b/sys-apps/fwupd/fwupd-1.8.4.ebuild
new file mode 100644
index 000000000000..995724a81068
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.8.4.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit linux-info meson python-single-r1 vala udev xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ fastboot? ( gusb )
+ logitech? ( gusb )
+ minimal? ( !introspection )
+ modemmanager? ( gusb )
+ spi? ( lzma )
+ synaptics? ( gnutls )
+ uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ >=dev-util/meson-0.60.0
+ virtual/pkgconfig
+ gtk-doc? (
+ >=dev-util/gi-docgen-2021.1
+ )
+ bash-completion? ( >=app-shells/bash-completion-2.0 )
+ introspection? ( dev-libs/gobject-introspection )
+ man? (
+ app-text/docbook-sgml-utils
+ sys-apps/help2man
+ )
+ test? (
+ dev-util/umockdev
+ net-libs/gnutls[tools]
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ app-arch/xz-utils
+ >=dev-libs/glib-2.58:2
+ dev-libs/json-glib
+ dev-libs/libgudev:=
+ >=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.1.13:=[introspection?]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ ')
+ >=net-libs/libsoup-2.51.92:2.4[introspection?]
+ net-misc/curl
+ archive? ( app-arch/libarchive:= )
+ cbor? ( dev-libs/libcbor )
+ dell? (
+ >=app-crypt/tpm2-tss-2.0
+ >=sys-libs/libsmbios-2.4.0
+ )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( net-libs/gnutls )
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+ logitech? ( dev-libs/protobuf-c:= )
+ lzma? ( app-arch/xz-utils )
+ modemmanager? ( net-misc/modemmanager[qmi] )
+ policykit? ( >=sys-auth/polkit-0.114 )
+ sqlite? ( dev-db/sqlite )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss:= )
+ uefi? (
+ sys-apps/fwupd-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.3-docgen_deps_test.patch
+ "${FILESDIR}"/${PN}-1.8.4-installed_tests.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ vala_setup
+ if use nvme ; then
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+
+ sed -e '/platform-integrity/d' \
+ -i plugins/meson.build || die #753521
+
+ sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
+ -i docs/meson.build || die
+
+ python_fix_shebang "${S}"/contrib/*.py
+}
+
+src_configure() {
+ # TODO (maybe): acpi_phat, bcm57xx, cfu, cpu, emmc, ep963x, mtd, nitrokey,
+ # parade_lspcon, pixart_rf, realtek_mst, scsi, redfish, upower
+ local plugins=(
+ -Dplugin_gpio="enabled"
+ $(meson_feature amt plugin_amt)
+ $(meson_feature dell plugin_dell)
+ $(meson_feature fastboot plugin_fastboot)
+ $(meson_feature flashrom plugin_flashrom)
+ $(meson_feature gusb plugin_uf2)
+ $(meson_feature logitech plugin_logitech_bulkcontroller)
+ $(meson_feature modemmanager plugin_modem_manager)
+ $(meson_feature nvme plugin_nvme)
+ $(meson_use spi plugin_intel_spi)
+ $(meson_feature synaptics plugin_synaptics_mst)
+ $(meson_feature synaptics plugin_synaptics_rmi)
+ $(meson_feature tpm plugin_tpm)
+ $(meson_feature uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_capsule_splash)
+ $(meson_feature uefi plugin_uefi_pk)
+ )
+ if use ppc64 || use riscv ; then
+ plugins+=( -Dplugin_msr="disabled" )
+ fi
+
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ -Dconsolekit="disabled"
+ -Dcurl="enabled"
+ -Defi_binary="false"
+ -Dgresource_quirks="disabled"
+ -Dsupported_build="enabled"
+ -Dudevdir="${EPREFIX}$(get_udevdir)"
+ $(meson_feature archive libarchive)
+ $(meson_use bash-completion bash_completion)
+ $(meson_feature bluetooth bluez)
+ $(meson_feature cbor)
+ $(meson_feature elogind)
+ $(meson_feature gnutls)
+ $(meson_feature gtk-doc docs)
+ $(meson_feature gusb)
+ $(meson_feature lzma)
+ $(meson_use man)
+ $(meson_feature introspection)
+ $(meson_feature policykit polkit)
+ $(meson_feature sqlite)
+ $(meson_feature systemd)
+ $(meson_use test tests)
+
+ ${plugins[@]}
+ )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ use minimal || udev_reload
+}
+
+pkg_postrm() {
+ use minimal || udev_reload
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2023-03-06 22:06 Marek Szuba
0 siblings, 0 replies; 28+ messages in thread
From: Marek Szuba @ 2023-03-06 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 3d5d8540cfb53f55d192ff0867ba4d96b14062a5
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 21:57:43 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 6 22:06:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5d8540
sys-apps/fwupd: backport the 2nd part of fwupdtool get-devices segfault fix
Closes: https://bugs.gentoo.org/895716
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/fwupd-1.8.11-empty_kernel_cmdline.patch | 19 ++
sys-apps/fwupd/fwupd-1.8.11-r1.ebuild | 194 +++++++++++++++++++++
2 files changed, 213 insertions(+)
diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch b/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
new file mode 100644
index 000000000000..42d5915397b8
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
@@ -0,0 +1,19 @@
+From 7e502cf7d3da00a978201455f3a3799ae4aded75 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 6 Mar 2023 16:56:05 +0000
+Subject: [PATCH] Fix a critical warning when parsing an empty kernel cmdline
+
+Fix the bounds check so we never pass a bufsz of zero to fu_strsplit().
+
+Resolves: https://github.com/fwupd/fwupd/issues/5575
+--- a/libfwupdplugin/fu-kernel.c
++++ b/libfwupdplugin/fu-kernel.c
+@@ -253,7 +253,7 @@ fu_kernel_get_cmdline(GError **error)
+ if (!g_file_get_contents("/proc/cmdline", &buf, &bufsz, error))
+ return NULL;
+ hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+- if (bufsz > 0) {
++ if (bufsz > 1) {
+ g_auto(GStrv) tokens = fu_strsplit(buf, bufsz - 1, " ", -1);
+ for (guint i = 0; tokens[i] != NULL; i++) {
+ g_auto(GStrv) kv = NULL;
diff --git a/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild
new file mode 100644
index 000000000000..fa2a0075952f
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit meson python-single-r1 vala udev xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ fastboot? ( gusb )
+ logitech? ( gusb )
+ minimal? ( !introspection )
+ modemmanager? ( gusb )
+ spi? ( lzma )
+ synaptics? ( gnutls )
+ test? ( archive gusb )
+ uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ >=dev-util/meson-0.60.0
+ virtual/pkgconfig
+ gtk-doc? (
+ $(python_gen_cond_dep '
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ ')
+ >=dev-util/gi-docgen-2021.1
+ )
+ bash-completion? ( >=app-shells/bash-completion-2.0 )
+ introspection? ( dev-libs/gobject-introspection )
+ test? (
+ dev-util/umockdev
+ net-libs/gnutls[tools]
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ app-arch/xz-utils
+ >=dev-libs/glib-2.58:2
+ dev-libs/json-glib
+ dev-libs/libgudev:=
+ >=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.1.13:=[introspection?]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ ')
+ net-misc/curl
+ archive? ( app-arch/libarchive:= )
+ cbor? ( dev-libs/libcbor:= )
+ dell? (
+ >=app-crypt/tpm2-tss-2.0
+ >=sys-libs/libsmbios-2.4.0
+ )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( net-libs/gnutls )
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+ logitech? ( dev-libs/protobuf-c:= )
+ lzma? ( app-arch/xz-utils )
+ modemmanager? ( net-misc/modemmanager[qmi] )
+ policykit? ( >=sys-auth/polkit-0.114 )
+ sqlite? ( dev-db/sqlite )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss:= )
+ uefi? (
+ sys-apps/fwupd-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.11-installed_tests.patch
+ "${FILESDIR}"/${PN}-1.8.11-empty_kernel_cmdline.patch
+)
+
+src_prepare() {
+ default
+
+ vala_setup
+
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+
+ sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
+ -i docs/meson.build || die
+
+ python_fix_shebang "${S}"/contrib/*.py
+}
+
+src_configure() {
+ local plugins=(
+ -Dplugin_gpio="enabled"
+ $(meson_feature amt plugin_intel_me)
+ $(meson_feature dell plugin_dell)
+ $(meson_feature fastboot plugin_fastboot)
+ $(meson_feature flashrom plugin_flashrom)
+ $(meson_feature gusb plugin_uf2)
+ $(meson_feature logitech plugin_logitech_bulkcontroller)
+ $(meson_feature modemmanager plugin_modem_manager)
+ $(meson_feature nvme plugin_nvme)
+ $(meson_use spi plugin_intel_spi)
+ $(meson_feature synaptics plugin_synaptics_mst)
+ $(meson_feature synaptics plugin_synaptics_rmi)
+ $(meson_feature tpm plugin_tpm)
+ $(meson_feature uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_capsule_splash)
+ $(meson_feature uefi plugin_uefi_pk)
+ )
+ if use ppc64 || use riscv ; then
+ plugins+=( -Dplugin_msr="disabled" )
+ fi
+
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ -Dconsolekit="disabled"
+ -Dcurl="enabled"
+ -Defi_binary="false"
+ -Dman="true"
+ -Dsupported_build="enabled"
+ -Dudevdir="${EPREFIX}$(get_udevdir)"
+ $(meson_feature archive libarchive)
+ $(meson_use bash-completion bash_completion)
+ $(meson_feature bluetooth bluez)
+ $(meson_feature cbor)
+ $(meson_feature elogind)
+ $(meson_feature gnutls)
+ $(meson_feature gtk-doc docs)
+ $(meson_feature gusb)
+ $(meson_feature lzma)
+ $(meson_feature introspection)
+ $(meson_feature policykit polkit)
+ $(meson_feature sqlite)
+ $(meson_feature systemd)
+ $(meson_use test tests)
+
+ ${plugins[@]}
+ )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_test() {
+ LC_ALL="C" meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ use minimal || udev_reload
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ use minimal || udev_reload
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2023-03-30 9:47 Marek Szuba
0 siblings, 0 replies; 28+ messages in thread
From: Marek Szuba @ 2023-03-30 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 65df473d212dc268533d031ef061af663f34e91b
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 09:13:13 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 09:46:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65df473d
sys-apps/fwupd: add 1.8.13
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
.../fwupd/files/fwupd-1.8.13-installed_tests.patch | 406 +++++++++++++++++++++
sys-apps/fwupd/fwupd-1.8.13.ebuild | 193 ++++++++++
3 files changed, 600 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index d71556e833d1..1f3373d28c76 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,2 +1,3 @@
DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97
DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de
+DIST fwupd-1.8.13.tar.xz 3734812 BLAKE2B fb4d172e88dd15e13e4a682e87ce65f7b7ff25bd952fc2efed54bf5d8ad32874f91f143c17c90d4d63ec9138f214338f55d073a2c82bc86bf01b2531ef4a88cc SHA512 82616a3a239574020edbe6d026fb1652a0b0d1e173cb67f85d05829d4ab498852d5137019665de3c7102f16853aa4b195a9de7df039bc18857b226b04b5aec71
diff --git a/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch
new file mode 100644
index 000000000000..f97343be5224
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch
@@ -0,0 +1,406 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -10,20 +10,10 @@
+ subdir('fish-completion')
+ endif
+
+-if get_option('tests')
+-subdir('device-tests')
+-endif
+-
+ if build_daemon
+ subdir('motd')
+ endif
+
+-if get_option('tests')
+- if build_daemon
+- subdir('installed-tests')
+- endif
+-endif
+-
+ if build_standalone
+ install_data(['daemon.conf'],
+ install_dir: join_paths(sysconfdir, 'fwupd')
+--- a/libfwupdplugin/meson.build
++++ b/libfwupdplugin/meson.build
+@@ -371,6 +371,7 @@
+ )
+ test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env)
+
++ if false
+ install_data([
+ 'tests/chassis_type',
+ 'tests/sys_vendor',
+@@ -389,6 +390,7 @@
+ ],
+ install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'),
+ )
++ endif
+ endif
+
+ fwupdplugin_incdir = include_directories('.')
+--- a/libfwupdplugin/tests/meson.build
++++ b/libfwupdplugin/tests/meson.build
+@@ -10,6 +10,5 @@
+ command: [
+ python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@',
+ ],
+- install: true,
+ install_dir: installed_test_datadir,
+ )
+--- a/plugins/acpi-dmar/meson.build
++++ b/plugins/acpi-dmar/meson.build
+@@ -28,7 +28,6 @@
+ plugin_libs,
+ plugin_builtin_acpi_dmar,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/acpi-facp/meson.build
++++ b/plugins/acpi-facp/meson.build
+@@ -28,7 +28,6 @@
+ plugin_libs,
+ plugin_builtin_acpi_facp,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/acpi-ivrs/meson.build
++++ b/plugins/acpi-ivrs/meson.build
+@@ -28,7 +28,6 @@
+ plugin_libs,
+ plugin_builtin_acpi_ivrs,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/acpi-phat/meson.build
++++ b/plugins/acpi-phat/meson.build
+@@ -31,7 +31,6 @@
+ plugin_libs,
+ plugin_builtin_acpi_phat,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/ata/meson.build
++++ b/plugins/ata/meson.build
+@@ -33,7 +33,6 @@
+ plugin_libs,
+ plugin_builtin_ata,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/bcm57xx/meson.build
++++ b/plugins/bcm57xx/meson.build
+@@ -25,8 +25,6 @@
+ plugin_builtins += plugin_builtin_bcm57xx
+
+ if get_option('tests')
+- install_data(['tests/bcm57xx.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -41,7 +39,6 @@
+ plugin_libs,
+ plugin_builtin_bcm57xx,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/ccgx/meson.build
++++ b/plugins/ccgx/meson.build
+@@ -29,8 +29,6 @@
+ plugin_builtins += plugin_builtin_ccgx
+
+ if get_option('tests')
+- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -45,7 +43,6 @@
+ plugin_libs,
+ plugin_builtin_ccgx,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/dfu/meson.build
++++ b/plugins/dfu/meson.build
+@@ -70,7 +70,6 @@
+ plugin_libs,
+ plugin_builtin_dfu,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/elantp/meson.build
++++ b/plugins/elantp/meson.build
+@@ -22,8 +22,6 @@
+ plugin_builtins += plugin_builtin_elantp
+
+ if get_option('tests')
+- install_data(['tests/elantp.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -38,7 +36,6 @@
+ plugin_libs,
+ plugin_builtin_elantp,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/linux-swap/meson.build
++++ b/plugins/linux-swap/meson.build
+@@ -28,7 +28,6 @@
+ plugin_libs,
+ plugin_builtin_linux_swap,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/mtd/meson.build
++++ b/plugins/mtd/meson.build
+@@ -29,7 +29,6 @@
+ plugin_libs,
+ plugin_builtin_mtd,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/nitrokey/meson.build
++++ b/plugins/nitrokey/meson.build
+@@ -33,7 +33,6 @@
+ plugin_libs,
+ plugin_builtin_nitrokey,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/nvme/meson.build
++++ b/plugins/nvme/meson.build
+@@ -38,7 +38,6 @@
+ plugin_libs,
+ plugin_builtin_nvme,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/pixart-rf/meson.build
++++ b/plugins/pixart-rf/meson.build
+@@ -19,8 +19,6 @@
+ plugin_builtins += plugin_builtin_pxi
+
+ if get_option('tests')
+- install_data(['tests/pixart.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -35,7 +33,6 @@
+ plugin_libs,
+ plugin_builtin_pxi,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/redfish/meson.build
++++ b/plugins/redfish/meson.build
+@@ -40,16 +40,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/redfish-smbios.bin'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/redfish.conf'],
+- install_dir: join_paths(installed_test_datadir, 'tests'),
+- install_mode: 'rw-r-----',
+- )
+- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -69,7 +59,6 @@
+ fwupdplugin,
+ plugin_builtin_redfish,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/synaptics-mst/meson.build
++++ b/plugins/synaptics-mst/meson.build
+@@ -22,8 +22,6 @@
+ plugin_builtins += plugin_builtin_synaptics_mst
+
+ if get_option('tests')
+- install_data(['tests/synaptics-mst.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -44,7 +42,6 @@
+ fwupdplugin,
+ plugin_builtin_synaptics_mst,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/synaptics-prometheus/meson.build
++++ b/plugins/synaptics-prometheus/meson.build
+@@ -18,8 +18,6 @@
+ plugin_builtins += plugin_builtin_synaprom
+
+ if get_option('tests')
+- install_data(['tests/synaptics-prometheus.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -34,7 +32,6 @@
+ plugin_libs,
+ plugin_builtin_synaprom,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/synaptics-rmi/meson.build
++++ b/plugins/synaptics-rmi/meson.build
+@@ -25,8 +25,6 @@
+ plugin_builtins += plugin_builtin_synaptics_rmi
+
+ if get_option('tests')
+- install_data(['tests/synaptics-rmi-0x.builder.xml','tests/synaptics-rmi-10.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -41,7 +39,6 @@
+ plugin_libs,
+ plugin_builtin_synaptics_rmi,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/uefi-capsule/meson.build
++++ b/plugins/uefi-capsule/meson.build
+@@ -149,25 +149,6 @@
+ ],
+ )
+ test('uefi-self-test', e, env: env)
+-
+-# to use these do `sudo systemctl edit fwupd.service` and set
+-# Environment="FWUPD_SYSFSFWDIR=/usr/share/installed-tests/fwupd"
+-install_data([
+- 'tests/efi/esrt/entries/entry0/capsule_flags',
+- 'tests/efi/esrt/entries/entry0/fw_class',
+- 'tests/efi/esrt/entries/entry0/fw_type',
+- 'tests/efi/esrt/entries/entry0/fw_version',
+- 'tests/efi/esrt/entries/entry0/last_attempt_status',
+- 'tests/efi/esrt/entries/entry0/last_attempt_version',
+- 'tests/efi/esrt/entries/entry0/lowest_supported_fw_version',
+- ],
+- install_dir: join_paths(installed_test_datadir, 'efi/esrt/entries/entry0'),
+-)
+-install_data([
+- 'tests/efi/efivars/CapsuleMax-39b68c46-f7fb-441b-b6ec-16b0f69821f3',
+- ],
+- install_dir: join_paths(installed_test_datadir, 'efi/efivars'),
+-)
+ endif
+
+ endif
+--- a/plugins/uefi-dbx/meson.build
++++ b/plugins/uefi-dbx/meson.build
+@@ -31,7 +31,6 @@
+ plugin_libs,
+ plugin_builtin_uefi_dbx,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/uf2/meson.build
++++ b/plugins/uf2/meson.build
+@@ -18,8 +18,6 @@
+ plugin_builtins += plugin_builtin_uf2
+
+ if get_option('tests')
+- install_data(['tests/uf2.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -34,7 +32,6 @@
+ plugin_libs,
+ plugin_builtin_uf2,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/vli/meson.build
++++ b/plugins/vli/meson.build
+@@ -48,7 +48,6 @@
+ plugin_libs,
+ plugin_builtin_vli,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/plugins/wacom-usb/meson.build
++++ b/plugins/wacom-usb/meson.build
+@@ -23,8 +23,6 @@
+ plugin_builtins += plugin_builtin_wac
+
+ if get_option('tests')
+- install_data(['tests/wacom-usb.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -39,7 +37,6 @@
+ plugin_libs,
+ plugin_builtin_wac,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ c_args: [
+--- a/src/tests/host-emulate/meson.build
++++ b/src/tests/host-emulate/meson.build
+@@ -8,7 +8,6 @@
+ output: '@0@.gz'.format(input_file),
+ capture: true,
+ command: [gzip, '-k', '--stdout', '@INPUT@'],
+- install: true,
+ install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
+ )
+ endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.13.ebuild b/sys-apps/fwupd/fwupd-1.8.13.ebuild
new file mode 100644
index 000000000000..0689a45a9731
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.8.13.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit meson python-single-r1 vala udev xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ fastboot? ( gusb )
+ logitech? ( gusb )
+ minimal? ( !introspection )
+ modemmanager? ( gusb )
+ spi? ( lzma )
+ synaptics? ( gnutls )
+ test? ( archive gusb )
+ uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ >=dev-util/meson-0.60.0
+ virtual/pkgconfig
+ gtk-doc? (
+ $(python_gen_cond_dep '
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ ')
+ >=dev-util/gi-docgen-2021.1
+ )
+ bash-completion? ( >=app-shells/bash-completion-2.0 )
+ introspection? ( dev-libs/gobject-introspection )
+ test? (
+ dev-util/umockdev
+ net-libs/gnutls[tools]
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ app-arch/xz-utils
+ >=dev-libs/glib-2.58:2
+ dev-libs/json-glib
+ dev-libs/libgudev:=
+ >=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.1.13:=[introspection?]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ ')
+ net-misc/curl
+ archive? ( app-arch/libarchive:= )
+ cbor? ( dev-libs/libcbor:= )
+ dell? (
+ >=app-crypt/tpm2-tss-2.0
+ >=sys-libs/libsmbios-2.4.0
+ )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( net-libs/gnutls )
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+ logitech? ( dev-libs/protobuf-c:= )
+ lzma? ( app-arch/xz-utils )
+ modemmanager? ( net-misc/modemmanager[qmi] )
+ policykit? ( >=sys-auth/polkit-0.114 )
+ sqlite? ( dev-db/sqlite )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss:= )
+ uefi? (
+ sys-apps/fwupd-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
+)
+
+src_prepare() {
+ default
+
+ vala_setup
+
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+
+ sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
+ -i docs/meson.build || die
+
+ python_fix_shebang "${S}"/contrib/*.py
+}
+
+src_configure() {
+ local plugins=(
+ -Dplugin_gpio="enabled"
+ $(meson_feature amt plugin_intel_me)
+ $(meson_feature dell plugin_dell)
+ $(meson_feature fastboot plugin_fastboot)
+ $(meson_feature flashrom plugin_flashrom)
+ $(meson_feature gusb plugin_uf2)
+ $(meson_feature logitech plugin_logitech_bulkcontroller)
+ $(meson_feature modemmanager plugin_modem_manager)
+ $(meson_feature nvme plugin_nvme)
+ $(meson_use spi plugin_intel_spi)
+ $(meson_feature synaptics plugin_synaptics_mst)
+ $(meson_feature synaptics plugin_synaptics_rmi)
+ $(meson_feature tpm plugin_tpm)
+ $(meson_feature uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_capsule_splash)
+ $(meson_feature uefi plugin_uefi_pk)
+ )
+ if use ppc64 || use riscv ; then
+ plugins+=( -Dplugin_msr="disabled" )
+ fi
+
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ -Dconsolekit="disabled"
+ -Dcurl="enabled"
+ -Defi_binary="false"
+ -Dman="true"
+ -Dsupported_build="enabled"
+ -Dudevdir="${EPREFIX}$(get_udevdir)"
+ $(meson_feature archive libarchive)
+ $(meson_use bash-completion bash_completion)
+ $(meson_feature bluetooth bluez)
+ $(meson_feature cbor)
+ $(meson_feature elogind)
+ $(meson_feature gnutls)
+ $(meson_feature gtk-doc docs)
+ $(meson_feature gusb)
+ $(meson_feature lzma)
+ $(meson_feature introspection)
+ $(meson_feature policykit polkit)
+ $(meson_feature sqlite)
+ $(meson_feature systemd)
+ $(meson_use test tests)
+
+ ${plugins[@]}
+ )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_test() {
+ LC_ALL="C" meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ use minimal || udev_reload
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ use minimal || udev_reload
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2023-05-19 8:37 Marek Szuba
0 siblings, 0 replies; 28+ messages in thread
From: Marek Szuba @ 2023-05-19 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 902d3c43cca21bc6a83905325baa23413b3802d1
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 08:12:04 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri May 19 08:37:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902d3c43
sys-apps/fwupd: add 1.8.15, drop 1.8.11-r1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/Manifest | 2 +-
.../files/fwupd-1.8.11-empty_kernel_cmdline.patch | 19 -
.../fwupd/files/fwupd-1.8.11-installed_tests.patch | 406 ---------------------
...{fwupd-1.8.11-r1.ebuild => fwupd-1.8.15.ebuild} | 3 +-
4 files changed, 2 insertions(+), 428 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 2755e0c34e69..4a28e9805f4a 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,3 @@
DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97
-DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de
DIST fwupd-1.8.14.tar.xz 3733176 BLAKE2B 6d17ee9ce1fb46a9d0a8a97d54f1873888635805af00a05ad365b32d48d6e58b48b52d706400067ca8cf6f6b846f6b8799c44d66ec64ab2fca5812b199ac2ac5 SHA512 80669f1c8ca60ac646f9a7aa4028edd23d1fc6853d999f60d292fabbfc81733f06b1f76a2987f0af62a739aa2cf5cc75fc40c9283fd37f4d8157f1a08df6fcd2
+DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch b/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
deleted file mode 100644
index 42d5915397b8..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 7e502cf7d3da00a978201455f3a3799ae4aded75 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 6 Mar 2023 16:56:05 +0000
-Subject: [PATCH] Fix a critical warning when parsing an empty kernel cmdline
-
-Fix the bounds check so we never pass a bufsz of zero to fu_strsplit().
-
-Resolves: https://github.com/fwupd/fwupd/issues/5575
---- a/libfwupdplugin/fu-kernel.c
-+++ b/libfwupdplugin/fu-kernel.c
-@@ -253,7 +253,7 @@ fu_kernel_get_cmdline(GError **error)
- if (!g_file_get_contents("/proc/cmdline", &buf, &bufsz, error))
- return NULL;
- hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-- if (bufsz > 0) {
-+ if (bufsz > 1) {
- g_auto(GStrv) tokens = fu_strsplit(buf, bufsz - 1, " ", -1);
- for (guint i = 0; tokens[i] != NULL; i++) {
- g_auto(GStrv) kv = NULL;
diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
deleted file mode 100644
index 819b6799ebdf..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
+++ /dev/null
@@ -1,406 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -10,20 +10,10 @@
- subdir('fish-completion')
- endif
-
--if get_option('tests')
--subdir('device-tests')
--endif
--
- if build_daemon
- subdir('motd')
- endif
-
--if get_option('tests')
-- if build_daemon
-- subdir('installed-tests')
-- endif
--endif
--
- if build_standalone
- install_data(['daemon.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
---- a/libfwupdplugin/meson.build
-+++ b/libfwupdplugin/meson.build
-@@ -370,6 +370,7 @@
- )
- test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env)
-
-+ if false
- install_data([
- 'tests/chassis_type',
- 'tests/sys_vendor',
-@@ -388,6 +389,7 @@
- ],
- install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'),
- )
-+ endif
- endif
-
- fwupdplugin_incdir = include_directories('.')
---- a/libfwupdplugin/tests/meson.build
-+++ b/libfwupdplugin/tests/meson.build
-@@ -10,6 +10,5 @@
- command: [
- python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@',
- ],
-- install: true,
- install_dir: installed_test_datadir,
- )
---- a/plugins/acpi-dmar/meson.build
-+++ b/plugins/acpi-dmar/meson.build
-@@ -28,7 +28,6 @@
- plugin_libs,
- plugin_builtin_acpi_dmar,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/acpi-facp/meson.build
-+++ b/plugins/acpi-facp/meson.build
-@@ -28,7 +28,6 @@
- plugin_libs,
- plugin_builtin_acpi_facp,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/acpi-ivrs/meson.build
-+++ b/plugins/acpi-ivrs/meson.build
-@@ -28,7 +28,6 @@
- plugin_libs,
- plugin_builtin_acpi_ivrs,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/acpi-phat/meson.build
-+++ b/plugins/acpi-phat/meson.build
-@@ -31,7 +31,6 @@
- plugin_libs,
- plugin_builtin_acpi_phat,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/ata/meson.build
-+++ b/plugins/ata/meson.build
-@@ -33,7 +33,6 @@
- plugin_libs,
- plugin_builtin_ata,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/bcm57xx/meson.build
-+++ b/plugins/bcm57xx/meson.build
-@@ -25,8 +25,6 @@
- plugin_builtins += plugin_builtin_bcm57xx
-
- if get_option('tests')
-- install_data(['tests/bcm57xx.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -41,7 +39,6 @@
- plugin_libs,
- plugin_builtin_bcm57xx,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/ccgx/meson.build
-+++ b/plugins/ccgx/meson.build
-@@ -29,8 +29,6 @@
- plugin_builtins += plugin_builtin_ccgx
-
- if get_option('tests')
-- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -45,7 +43,6 @@
- plugin_libs,
- plugin_builtin_ccgx,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/dfu/meson.build
-+++ b/plugins/dfu/meson.build
-@@ -70,7 +70,6 @@
- plugin_libs,
- plugin_builtin_dfu,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/elantp/meson.build
-+++ b/plugins/elantp/meson.build
-@@ -22,8 +22,6 @@
- plugin_builtins += plugin_builtin_elantp
-
- if get_option('tests')
-- install_data(['tests/elantp.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -38,7 +36,6 @@
- plugin_libs,
- plugin_builtin_elantp,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/linux-swap/meson.build
-+++ b/plugins/linux-swap/meson.build
-@@ -28,7 +28,6 @@
- plugin_libs,
- plugin_builtin_linux_swap,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/mtd/meson.build
-+++ b/plugins/mtd/meson.build
-@@ -30,7 +30,6 @@
- plugin_libs,
- plugin_builtin_mtd,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/nitrokey/meson.build
-+++ b/plugins/nitrokey/meson.build
-@@ -33,7 +33,6 @@
- plugin_libs,
- plugin_builtin_nitrokey,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/nvme/meson.build
-+++ b/plugins/nvme/meson.build
-@@ -38,7 +38,6 @@
- plugin_libs,
- plugin_builtin_nvme,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/pixart-rf/meson.build
-+++ b/plugins/pixart-rf/meson.build
-@@ -19,8 +19,6 @@
- plugin_builtins += plugin_builtin_pxi
-
- if get_option('tests')
-- install_data(['tests/pixart.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -35,7 +33,6 @@
- plugin_libs,
- plugin_builtin_pxi,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/redfish/meson.build
-+++ b/plugins/redfish/meson.build
-@@ -40,16 +40,6 @@
- )
-
- if get_option('tests')
-- install_data(['tests/redfish-smbios.bin'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
-- install_data(['tests/redfish.conf'],
-- install_dir: join_paths(installed_test_datadir, 'tests'),
-- install_mode: 'rw-r-----',
-- )
-- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
-- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
-- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
-- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -70,7 +60,6 @@
- fwupdplugin,
- plugin_builtin_redfish,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/synaptics-mst/meson.build
-+++ b/plugins/synaptics-mst/meson.build
-@@ -22,8 +22,6 @@
- plugin_builtins += plugin_builtin_synaptics_mst
-
- if get_option('tests')
-- install_data(['tests/synaptics-mst.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -47,7 +45,6 @@
- c_args: [
- cargs,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/synaptics-prometheus/meson.build
-+++ b/plugins/synaptics-prometheus/meson.build
-@@ -18,8 +18,6 @@
- plugin_builtins += plugin_builtin_synaprom
-
- if get_option('tests')
-- install_data(['tests/synaptics-prometheus.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -35,7 +33,6 @@
- plugin_builtin_synaprom,
- ],
- c_args: cargs,
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/synaptics-rmi/meson.build
-+++ b/plugins/synaptics-rmi/meson.build
-@@ -25,8 +25,6 @@
- plugin_builtins += plugin_builtin_synaptics_rmi
-
- if get_option('tests')
-- install_data(['tests/synaptics-rmi-0x.builder.xml','tests/synaptics-rmi-10.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -41,7 +39,6 @@
- plugin_libs,
- plugin_builtin_synaptics_rmi,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/uefi-capsule/meson.build
-+++ b/plugins/uefi-capsule/meson.build
-@@ -146,25 +146,6 @@
- c_args: cargs
- )
- test('uefi-self-test', e, env: env)
--
--# to use these do `sudo systemctl edit fwupd.service` and set
--# Environment="FWUPD_SYSFSFWDIR=/usr/share/installed-tests/fwupd"
--install_data([
-- 'tests/efi/esrt/entries/entry0/capsule_flags',
-- 'tests/efi/esrt/entries/entry0/fw_class',
-- 'tests/efi/esrt/entries/entry0/fw_type',
-- 'tests/efi/esrt/entries/entry0/fw_version',
-- 'tests/efi/esrt/entries/entry0/last_attempt_status',
-- 'tests/efi/esrt/entries/entry0/last_attempt_version',
-- 'tests/efi/esrt/entries/entry0/lowest_supported_fw_version',
-- ],
-- install_dir: join_paths(installed_test_datadir, 'efi/esrt/entries/entry0'),
--)
--install_data([
-- 'tests/efi/efivars/CapsuleMax-39b68c46-f7fb-441b-b6ec-16b0f69821f3',
-- ],
-- install_dir: join_paths(installed_test_datadir, 'efi/efivars'),
--)
- endif
-
- endif
---- a/plugins/uefi-dbx/meson.build
-+++ b/plugins/uefi-dbx/meson.build
-@@ -32,7 +32,6 @@
- plugin_builtin_uefi_dbx,
- ],
- c_args: cargs,
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/uf2/meson.build
-+++ b/plugins/uf2/meson.build
-@@ -18,8 +18,6 @@
- plugin_builtins += plugin_builtin_uf2
-
- if get_option('tests')
-- install_data(['tests/uf2.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -34,7 +32,6 @@
- plugin_libs,
- plugin_builtin_uf2,
- ],
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/vli/meson.build
-+++ b/plugins/vli/meson.build
-@@ -49,7 +49,6 @@
- plugin_builtin_vli,
- ],
- c_args: cargs,
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/plugins/wacom-usb/meson.build
-+++ b/plugins/wacom-usb/meson.build
-@@ -23,8 +23,6 @@
- plugin_builtins += plugin_builtin_wac
-
- if get_option('tests')
-- install_data(['tests/wacom-usb.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -40,7 +38,6 @@
- plugin_builtin_wac,
- ],
- c_args: cargs,
-- install: true,
- install_rpath: libdir_pkg,
- install_dir: installed_test_bindir,
- )
---- a/src/tests/host-emulate/meson.build
-+++ b/src/tests/host-emulate/meson.build
-@@ -8,7 +8,6 @@
- output: '@0@.gz'.format(input_file),
- capture: true,
- command: [gzip, '-k', '--stdout', '@INPUT@'],
-- install: true,
- install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
- )
- endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.15.ebuild
similarity index 97%
rename from sys-apps/fwupd/fwupd-1.8.11-r1.ebuild
rename to sys-apps/fwupd/fwupd-1.8.15.ebuild
index fa2a0075952f..0689a45a9731 100644
--- a/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.15.ebuild
@@ -92,8 +92,7 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-installed_tests.patch
- "${FILESDIR}"/${PN}-1.8.11-empty_kernel_cmdline.patch
+ "${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2023-08-25 10:48 Marek Szuba
0 siblings, 0 replies; 28+ messages in thread
From: Marek Szuba @ 2023-08-25 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 0868bf5c8e9268edb68016b0db4aa2544450eccf
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 10:40:21 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 10:48:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0868bf5c
sys-apps/fwupd: add 1.9.4
Includes a patch disabling thunderbolt-self-test unless USE=test-full,
as dev-util/umockdev interactions with the sandbox have been known
to persistently yet somewhat unpredictably (I have yet to see this
on any of my systems) lock up waiting for expected device files and
subsequently time out. Previous maintainers attempted to address this
by changing the time-out of thunderbolt-self-test but alas, at least
for some users - including our CI - all that did was delay the failure.
Closes: https://bugs.gentoo.org/908540
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/Manifest | 1 +
.../fwupd/files/fwupd-1.9.4-fragile_tests.patch | 24 +++
sys-apps/fwupd/fwupd-1.9.4.ebuild | 206 +++++++++++++++++++++
sys-apps/fwupd/metadata.xml | 1 +
4 files changed, 232 insertions(+)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index cd291d7bcc5c..bac868fc07d8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,2 +1,3 @@
DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
+DIST fwupd-1.9.4.tar.xz 3836580 BLAKE2B 7d5f97bb804759cb2b48e8bbe6c5c8c0ad6bc835e3f2ca7385ddf830dc8d7e8bd5c658a4bccccce02853e5282aa90ac8f0494a47822d22e07b1dd7600f9aea9a SHA512 c9c3242dc93a1dea967115383377b72dfc813c68b9328e97f581d0d7327daf7b6665323037e9353312ae5debe52fbfec869cfe743bbeae4ab6fbc6ff48562da7
diff --git a/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch b/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch
new file mode 100644
index 000000000000..95105177499b
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch
@@ -0,0 +1,24 @@
+umockdev-based tests appear not to play nicely with the sandbox,
+often they work but on some systems they persistently fail.
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -60,6 +60,7 @@
+ option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
+ option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'})
+ option('tests', type : 'boolean', value : true, description : 'enable tests')
++option('test-full', type : 'boolean', value : false, description : 'enable tests known to be fragile when called from Gentoo ebuilds')
+ option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'})
+ option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
+ option('efi_os_dir', type: 'string', description : 'the hardcoded name of OS directory in ESP, e.g. fedora')
+--- a/plugins/thunderbolt/meson.build
++++ b/plugins/thunderbolt/meson.build
+@@ -19,7 +19,7 @@
+ plugin_builtins += plugin_builtin_thunderbolt
+
+ # we use functions from 2.52 in the tests
+-if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
++if get_option('tests') and get_option('test-full') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
diff --git a/sys-apps/fwupd/fwupd-1.9.4.ebuild b/sys-apps/fwupd/fwupd-1.9.4.ebuild
new file mode 100644
index 000000000000..568558450cfa
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.9.4.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-single-r1 vala udev xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ fastboot? ( gusb )
+ logitech? ( gusb )
+ minimal? ( !introspection )
+ modemmanager? ( gusb )
+ spi? ( lzma )
+ synaptics? ( gnutls )
+ test? ( archive gusb )
+ test-full? ( test )
+ uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ >=dev-util/meson-0.60.0
+ virtual/pkgconfig
+ gtk-doc? (
+ $(python_gen_cond_dep '
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ ')
+ >=dev-util/gi-docgen-2021.1
+ )
+ bash-completion? ( >=app-shells/bash-completion-2.0 )
+ introspection? ( dev-libs/gobject-introspection )
+ test? (
+ net-libs/gnutls[tools]
+ test-full? ( dev-util/umockdev )
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ app-arch/xz-utils
+ >=dev-libs/glib-2.68:2
+ >=dev-libs/json-glib-1.6.0
+ >=dev-libs/libgudev-232:=
+ >=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.3.6:=[introspection?]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ ')
+ >=net-misc/curl-7.62.0
+ archive? ( app-arch/libarchive:= )
+ cbor? ( >=dev-libs/libcbor-0.7.0:= )
+ dell? (
+ >=app-crypt/tpm2-tss-2.0
+ >=sys-libs/libsmbios-2.4.0
+ )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( >=net-libs/gnutls-3.6.0 )
+ gusb? ( >=dev-libs/libgusb-0.3.8[introspection?] )
+ logitech? ( dev-libs/protobuf-c:= )
+ lzma? ( app-arch/xz-utils )
+ modemmanager? ( net-misc/modemmanager[mbim,qmi] )
+ policykit? ( >=sys-auth/polkit-0.114 )
+ sqlite? ( dev-db/sqlite )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss:= )
+ uefi? (
+ sys-apps/fwupd-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.4-fragile_tests.patch
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if use test-full && has sandbox ${FEATURES}; then
+ ewarn "Certain ${PN} tests are fragile with sandboxing enabled,"
+ ewarn "see https://github.com/fwupd/fwupd/issues/1414."
+ ewarn "When in doubt, emerge ${PN} with USE=-test-full."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ vala_setup
+
+ sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
+ -i docs/meson.build || die
+
+ python_fix_shebang "${S}"/contrib/*.py
+}
+
+src_configure() {
+ local plugins=(
+ -Dplugin_gpio="enabled"
+ $(meson_feature amt plugin_intel_me)
+ $(meson_feature dell plugin_dell)
+ $(meson_feature fastboot plugin_fastboot)
+ $(meson_feature flashrom plugin_flashrom)
+ $(meson_feature gusb plugin_uf2)
+ $(meson_feature logitech plugin_logitech_bulkcontroller)
+ $(meson_feature modemmanager plugin_modem_manager)
+ $(meson_feature nvme plugin_nvme)
+ $(meson_use spi plugin_intel_spi)
+ $(meson_feature synaptics plugin_synaptics_mst)
+ $(meson_feature synaptics plugin_synaptics_rmi)
+ $(meson_feature tpm plugin_tpm)
+ $(meson_feature uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_capsule_splash)
+ $(meson_feature uefi plugin_uefi_pk)
+ )
+ if use ppc64 || use riscv ; then
+ plugins+=( -Dplugin_msr="disabled" )
+ fi
+
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ -Dconsolekit="disabled"
+ -Dcurl="enabled"
+ -Defi_binary="false"
+ -Dman="true"
+ -Dsupported_build="enabled"
+ -Dudevdir="${EPREFIX}$(get_udevdir)"
+ $(meson_feature archive libarchive)
+ $(meson_use bash-completion bash_completion)
+ $(meson_feature bluetooth bluez)
+ $(meson_feature cbor)
+ $(meson_feature elogind)
+ $(meson_feature gnutls)
+ $(meson_feature gtk-doc docs)
+ $(meson_feature gusb)
+ $(meson_feature lzma)
+ $(meson_feature introspection)
+ $(meson_feature policykit polkit)
+ $(meson_feature sqlite)
+ $(meson_feature systemd)
+ $(meson_use test tests)
+ $(meson_use test-full)
+
+ ${plugins[@]}
+ )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_test() {
+ LC_ALL="C" meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+ fi
+
+ if use test; then
+ # Preventing tests from being installed in the first place is a moving target,
+ # just axe them all afterwards.
+ rm -rf "${ED}"/etc/fwupd/remotes.d/fwupd-tests.conf \
+ "${ED}"/usr/libexec/installed-tests \
+ "${ED}"/usr/share/fwupd/device-tests \
+ "${ED}"/usr/share/fwupd/host-emulate.d/thinkpad-p1-iommu.json.gz \
+ "${ED}"/usr/share/installed-tests \
+ || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ use minimal || udev_reload
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ use minimal || udev_reload
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 258aab8e0e0c..8568986b263b 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -18,6 +18,7 @@
<flag name="modemmanager">Build and install Modem Manager plugin</flag>
<flag name="spi">Install Intel-SPI plugin</flag>
<flag name="synaptics">Install synaptics plugin</flag>
+ <flag name="test-full">Enable tests known not to play nicely with the sandbox</flag>
<flag name="tpm">Install Trusted Platform Module plugin</flag>
<flag name="uefi">Enable UEFI support</flag>
</use>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2023-09-28 8:25 Marek Szuba
0 siblings, 0 replies; 28+ messages in thread
From: Marek Szuba @ 2023-09-28 8:25 UTC (permalink / raw
To: gentoo-commits
commit: e47682057e9621a7728df1e4e510588bb9a80ed2
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 08:11:47 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 08:24:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4768205
sys-apps/fwupd: backport part 2 of parallel-build fixes
Closes: https://bugs.gentoo.org/913003
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch | 16 ++++++++++++++++
sys-apps/fwupd/fwupd-1.9.5.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch b/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch
new file mode 100644
index 000000000000..fb9d3562841e
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch
@@ -0,0 +1,16 @@
+From 085a89ce3f7734fd9bc0527df7f0bb05e27fbaef Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 12 Sep 2023 07:42:23 +0100
+Subject: [PATCH] trivial: Fix parallel build, harder still
+
+Fixes https://github.com/fwupd/fwupd/issues/6175
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -17,6 +17,7 @@ engine_dep = [
+ polkit,
+ sqlite,
+ cbor,
++ fwupdplugin_rs_dep,
+ ]
+
+ if get_option('passim').allowed()
diff --git a/sys-apps/fwupd/fwupd-1.9.5.ebuild b/sys-apps/fwupd/fwupd-1.9.5.ebuild
index 568558450cfa..b21f1294049f 100644
--- a/sys-apps/fwupd/fwupd-1.9.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.5.ebuild
@@ -94,6 +94,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.9.4-fragile_tests.patch
+ "${FILESDIR}"/${PN}-1.9.5-parallel_build.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
@ 2023-10-22 11:03 Marek Szuba
0 siblings, 0 replies; 28+ messages in thread
From: Marek Szuba @ 2023-10-22 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 37f0cbea5b1a7c5eae2840df4a0f01d5b6f41e3d
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 10:26:02 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 11:03:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f0cbea
sys-apps/fwupd: add 1.9.6, remove old
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/Manifest | 3 +-
.../fwupd/files/fwupd-1.9.6-fragile_tests.patch | 28 +++
sys-apps/fwupd/fwupd-1.8.15.ebuild | 193 ---------------------
.../{fwupd-1.9.5.ebuild => fwupd-1.9.6.ebuild} | 16 +-
sys-apps/fwupd/metadata.xml | 1 +
5 files changed, 37 insertions(+), 204 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 7215fc15d341..51548f44ce8f 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,2 @@
-DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
-DIST fwupd-1.9.5.tar.xz 3847088 BLAKE2B 0926f97a79d7795f3bd8ea71841a072b8f725800d9b33eaf6fc54c62e67f53e41faa5558979a53b0e83094d8dfd3b3263bc462380498c00484e29500ca6baf8c SHA512 19c152746d4d44f00c5bf3ed36b97249cb0a8fdedab351706a7d4e761fb142d096351555392b535ce976cb9e925505246542525a90319a2560f753a675ff26cf
+DIST fwupd-1.9.6.tar.xz 3863452 BLAKE2B 8b54efef5947dc4766a24b8501100f7e24707944b5c9aae3c3fcd88dfce230667507af8816203b0ececa0510485661f5f599c1cdc2285df72683ede4b7a6d15c SHA512 c65d795268e0e36fd2572ce3d4f2fb811412c16d583fa5463bee017a70b5d0f8b1b92460efa977a7d70bb5e3f6b5b02756e795e5f8ab7e7ac7874dc1ab5a0bfb
diff --git a/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch b/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch
new file mode 100644
index 000000000000..cc40dc7c9e01
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch
@@ -0,0 +1,28 @@
+umockdev-based tests appear not to play nicely with the sandbox,
+often they work but on some systems they persistently fail.
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -457,6 +457,11 @@
+ value: true,
+ description: 'enable tests',
+ )
++option('test-full',
++ type: 'boolean',
++ value: false,
++ description: 'enable tests known to be fragile when called from Gentoo ebuilds'
++)
+ option('curl',
+ type: 'feature',
+ description: 'libcurl support',
+--- a/plugins/thunderbolt/meson.build
++++ b/plugins/thunderbolt/meson.build
+@@ -19,7 +19,7 @@
+ plugin_builtins += plugin_builtin_thunderbolt
+
+ # we use functions from 2.52 in the tests
+-if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
++if get_option('tests') and get_option('test-full') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
diff --git a/sys-apps/fwupd/fwupd-1.8.15.ebuild b/sys-apps/fwupd/fwupd-1.8.15.ebuild
deleted file mode 100644
index c4692391da4b..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.15.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1 vala udev xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- fastboot? ( gusb )
- logitech? ( gusb )
- minimal? ( !introspection )
- modemmanager? ( gusb )
- spi? ( lzma )
- synaptics? ( gnutls )
- test? ( archive gusb )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- >=dev-util/meson-0.60.0
- virtual/pkgconfig
- gtk-doc? (
- $(python_gen_cond_dep '
- >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
- ')
- >=dev-util/gi-docgen-2021.1
- )
- bash-completion? ( >=app-shells/bash-completion-2.0 )
- introspection? ( dev-libs/gobject-introspection )
- test? (
- dev-util/umockdev
- net-libs/gnutls[tools]
- )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- app-arch/xz-utils
- >=dev-libs/glib-2.58:2
- dev-libs/json-glib
- dev-libs/libgudev:=
- >=dev-libs/libjcat-0.1.4[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=[introspection?]
- $(python_gen_cond_dep '
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- ')
- net-misc/curl
- archive? ( app-arch/libarchive:= )
- cbor? ( dev-libs/libcbor:= )
- dell? (
- >=app-crypt/tpm2-tss-2.0
- >=sys-libs/libsmbios-2.4.0
- )
- elogind? ( >=sys-auth/elogind-211 )
- flashrom? ( >=sys-apps/flashrom-1.2-r3 )
- gnutls? ( net-libs/gnutls )
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
- logitech? ( dev-libs/protobuf-c:= )
- lzma? ( app-arch/xz-utils )
- modemmanager? ( net-misc/modemmanager[qmi] )
- policykit? ( >=sys-auth/polkit-0.114 )
- sqlite? ( dev-db/sqlite )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss:= )
- uefi? (
- sys-apps/fwupd-efi
- sys-boot/efibootmgr
- sys-fs/udisks
- sys-libs/efivar
- )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
-)
-
-src_prepare() {
- default
-
- vala_setup
-
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
-
- sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
- -i docs/meson.build || die
-
- python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
- local plugins=(
- -Dplugin_gpio="enabled"
- $(meson_feature amt plugin_intel_me)
- $(meson_feature dell plugin_dell)
- $(meson_feature fastboot plugin_fastboot)
- $(meson_feature flashrom plugin_flashrom)
- $(meson_feature gusb plugin_uf2)
- $(meson_feature logitech plugin_logitech_bulkcontroller)
- $(meson_feature modemmanager plugin_modem_manager)
- $(meson_feature nvme plugin_nvme)
- $(meson_use spi plugin_intel_spi)
- $(meson_feature synaptics plugin_synaptics_mst)
- $(meson_feature synaptics plugin_synaptics_rmi)
- $(meson_feature tpm plugin_tpm)
- $(meson_feature uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_feature uefi plugin_uefi_pk)
- )
- if use ppc64 || use riscv ; then
- plugins+=( -Dplugin_msr="disabled" )
- fi
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="disabled"
- -Dcurl="enabled"
- -Defi_binary="false"
- -Dman="true"
- -Dsupported_build="enabled"
- -Dudevdir="${EPREFIX}$(get_udevdir)"
- $(meson_feature archive libarchive)
- $(meson_use bash-completion bash_completion)
- $(meson_feature bluetooth bluez)
- $(meson_feature cbor)
- $(meson_feature elogind)
- $(meson_feature gnutls)
- $(meson_feature gtk-doc docs)
- $(meson_feature gusb)
- $(meson_feature lzma)
- $(meson_feature introspection)
- $(meson_feature policykit polkit)
- $(meson_feature sqlite)
- $(meson_feature systemd)
- $(meson_use test tests)
-
- ${plugins[@]}
- )
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_test() {
- LC_ALL="C" meson_src_test
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- use minimal || udev_reload
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- use minimal || udev_reload
-}
diff --git a/sys-apps/fwupd/fwupd-1.9.5.ebuild b/sys-apps/fwupd/fwupd-1.9.6.ebuild
similarity index 91%
rename from sys-apps/fwupd/fwupd-1.9.5.ebuild
rename to sys-apps/fwupd/fwupd-1.9.6.ebuild
index b21f1294049f..09477afb6ce6 100644
--- a/sys-apps/fwupd/fwupd-1.9.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.6.ebuild
@@ -14,10 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
+IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^^ ( elogind minimal systemd )
- dell? ( uefi )
fastboot? ( gusb )
logitech? ( gusb )
minimal? ( !introspection )
@@ -31,6 +30,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="!test? ( test )"
BDEPEND="$(vala_depend)
+ $(python_gen_cond_dep '
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
>=dev-util/meson-0.60.0
virtual/pkgconfig
gtk-doc? (
@@ -60,10 +62,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=net-misc/curl-7.62.0
archive? ( app-arch/libarchive:= )
cbor? ( >=dev-libs/libcbor-0.7.0:= )
- dell? (
- >=app-crypt/tpm2-tss-2.0
- >=sys-libs/libsmbios-2.4.0
- )
elogind? ( >=sys-auth/elogind-211 )
flashrom? ( >=sys-apps/flashrom-1.2-r3 )
gnutls? ( >=net-libs/gnutls-3.6.0 )
@@ -90,11 +88,11 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
x11-libs/pango[introspection]
+ amdgpu? ( sys-kernel/linux-headers )
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.9.4-fragile_tests.patch
- "${FILESDIR}"/${PN}-1.9.5-parallel_build.patch
+ "${FILESDIR}"/${PN}-1.9.6-fragile_tests.patch
)
pkg_pretend() {
@@ -121,8 +119,8 @@ src_prepare() {
src_configure() {
local plugins=(
-Dplugin_gpio="enabled"
+ $(meson_feature amdgpu plugin_amdgpu)
$(meson_feature amt plugin_intel_me)
- $(meson_feature dell plugin_dell)
$(meson_feature fastboot plugin_fastboot)
$(meson_feature flashrom plugin_flashrom)
$(meson_feature gusb plugin_uf2)
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 8568986b263b..e4d8831cb829 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
+ <flag name="amdgpu">Build and install AMD dGPU (Navi3x and above) plugin</flag>
<flag name="amt">Build and install Intel AMT plugin</flag>
<flag name="cbor">Enable CBOR support for coSWID and uSWID via <pkg>dev-libs/libcbor</pkg></flag>
<flag name="dell">Enable Dell-specific support</flag>
^ permalink raw reply related [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-10-22 11:03 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-15 11:38 [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2023-10-22 11:03 Marek Szuba
2023-09-28 8:25 Marek Szuba
2023-08-25 10:48 Marek Szuba
2023-05-19 8:37 Marek Szuba
2023-03-30 9:47 Marek Szuba
2023-03-06 22:06 Marek Szuba
2022-08-31 13:24 Marek Szuba
2022-02-28 9:46 Lars Wendler
2021-10-15 14:33 Thomas Deutschmann
2021-06-15 23:04 Thomas Deutschmann
2021-06-15 23:04 Thomas Deutschmann
2021-05-20 9:11 Lars Wendler
2021-05-20 9:10 Lars Wendler
2021-05-20 9:10 Lars Wendler
2021-02-23 15:43 Lars Wendler
2021-02-16 16:22 Lars Wendler
2020-06-18 16:35 Lars Wendler
2020-03-06 15:26 Lars Wendler
2020-03-06 15:23 Lars Wendler
2020-03-06 12:36 Lars Wendler
2020-02-17 9:11 Lars Wendler
2019-04-15 12:18 Lars Wendler
2019-03-31 18:40 Lars Wendler
2019-03-28 11:50 Lars Wendler
2018-07-18 9:50 Lars Wendler
2017-07-05 6:29 Lars Wendler
2017-05-24 12:55 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox