From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- sys-apps/fwupd/Manifest | 8 +- sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch | 105 ------------------ sys-apps/fwupd/files/fwupd-r1 | 13 +++ sys-apps/fwupd/fwupd-1.2.4-r2.ebuild | 132 ----------------------- sys-apps/fwupd/fwupd-1.2.6-r1.ebuild | 143 +++++++++++++++++++++++++ sys-apps/fwupd/metadata.xml | 1 + 6 files changed, 161 insertions(+), 241 deletions(-) delete mode 100644 sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch create mode 100644 sys-apps/fwupd/files/fwupd-r1 delete mode 100644 sys-apps/fwupd/fwupd-1.2.4-r2.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.2.6-r1.ebuild (limited to 'sys-apps/fwupd') diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 97e37d0efe04..b9759dcc33f4 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,7 +1,7 @@ AUX fwupd 299 BLAKE2B 65d2229e93e03c38d5db2523bf1ca4f1663c12e3308426501b57b6d5d2dbf4c9756d64ea627ca892671e0e2cb97bda0221bf0313eed596a3ce85b83c0b4ad1d9 SHA512 8d9f94754a2b5d65e71134f9c6e2fca49433dc123441b37518acc7b7e68f397e19e12fad498b586f56fe6df887be6bf8f27c6041238a57afe3b5457026af197c -AUX fwupd-1.2.4-elogind.patch 3588 BLAKE2B dee3bf0916e1a294e637e1ee1c488f0bb7fea50819171ff6cada035e1d409f4e98ebd1fae652aeff43a3808be625bb113e05dce23c059c9419a64d2aee3999e1 SHA512 9c9eba10e3982f03b98d20ec3f9fe6e948de1390b9e6f6fd2bdf813329b8d5b8add32219312a4d85b68e0f3faa804fb4adea301f9d8c12c0aa4e1c65daa886fe -DIST fwupd-1.2.4.tar.gz 1808778 BLAKE2B 4dd8db0e73b148cba8ca43ec7942efa183f331a376b947421b8673d473ef868cef57e3abf4f50e031eb22f97fa8eb199b8bd7ef3b96efb598f842d0824c235a7 SHA512 7734be90459364c2e9ca35d9a9327e7becabe64cd0129d5c8f3cb4a95ef0195726c519862e843636952a3251ecea080907d1e6814c3037e9f90e8dde53b406ad +AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb DIST fwupd-1.2.5.tar.gz 1818559 BLAKE2B 0d30248bf3be093d3764624294fdd6e26b979560d70b47e67b3ca5f213177d807e749f5e30abd4d7d7d15e4be507103583834062b6a3243367169019e24a1bc7 SHA512 dc6a0def49225ce50bc89c3f76137497d4c8b71f94e42546fbf5221dc0af504ce6090f803ea9dca175f6166ff1341f6a3eab04652d744257c9e88dbd6875abc7 -EBUILD fwupd-1.2.4-r2.ebuild 3494 BLAKE2B f52a3a9aef81b4c90310228fb0bec40b0e340a5640d574b21b4423e5f1ae6b1f50d48f91534ad1bb20f1f82ee658985d2ca40c9998ff789bf22779435b573b40 SHA512 64eee7c81da78e0221ec90968b6b707b9e4480f310686b9752e46dbde99175da029938ce75dec322dab098a6c87b2eda7d4f03cb335692aaa7c133d9de2c523a +DIST fwupd-1.2.6.tar.gz 1861765 BLAKE2B 160af03c0c08bed730657520a15f96c9881996807d186a26074f10b6b340e27b0e783ae7a6b1fc433e4347cba535d49bca60b4d242101a9097fc2749f3cca0ee SHA512 c1111fd881126bf85424dec004e4321948cbdd603ed79989eee51f48197f8f0f391371834964dd1bff52eb3b353cc4c2e5714f6ff674b23dbd8e8d0e8a87ff27 EBUILD fwupd-1.2.5.ebuild 3481 BLAKE2B b6584f19d1e7a11870b82464fd68f14d9b1439dc3cf1bec274a41613ed66beba7723359a82dc3c32f46931549a1018b5598d805004f087e363bc5a53fec2a570 SHA512 0fbed24f38a96137a290548313aaf46aaf2436020d4a43072c343ed12dc911351ad967ff49c00df52fcdc34182c591d5339ce634ac5d2bf96a407bc519f4f1b6 -MISC metadata.xml 1074 BLAKE2B edf991df52234904d0d07b885b6e209e1f533babd3d2275eb2a57f1b85a64dce78f37cb412845285914af10f498d04bd746c5a4cf64ca77b36cb4de49f87e1c4 SHA512 a32ed6a766a8e538a7a95f2abeba57e5277105e15dc4346fefcb958bb93b95d421dd5edc2161295f5692ac47a3fe41d587eee1082179d73d1bb6e5c374d48450 +EBUILD fwupd-1.2.6-r1.ebuild 3706 BLAKE2B 24d91f6899f2aa8f045191926f1dbcfa7722dc9421edc169975cfa6b85271e978ea42496c1b9de51bd0156a242fa4ea42c65daa2b1febdb0cafcf91d1bd98f0b SHA512 03aa3ad72407fff3dc8b750df04f8ea92908b16af452f619f92294f320503c259f6dc2b4e53c6e71f33bb6dcc3b8ac190453703254b8e2bdf6a234a71730e8b8 +MISC metadata.xml 1137 BLAKE2B ffb495509527dd57cc2f835dd5bb2f37f0874ecf4e973732a56811c5688022072a4365bc5a1ee085f6df0225cd56e9a73c18a320ee4f5ba840398570f38275e2 SHA512 bb268eb8ccc78684bb0639962b4ce86de6c258c9f09a4b0adf8011dea35280d7b7b3e494d366b80d1fb2686845487100995b97291cbcb795d9623350de2428cc 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 1a8b7760001d..000000000000 --- 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 -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/files/fwupd-r1 b/sys-apps/fwupd/files/fwupd-r1 new file mode 100644 index 000000000000..4a4865ef15af --- /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.4-r2.ebuild b/sys-apps/fwupd/fwupd-1.2.4-r2.ebuild deleted file mode 100644 index 43db76e1c25a..000000000000 --- 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 "${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 +} + +pkg_postinst() { + elog "In case you are using openrc as init system" + elog "and you're upgrading from Lars Wendler + Enable update notification agent Enable ColorHug support through x11-misc/colord package. Enable Dell-specific support. -- cgit v1.2.3