diff options
Diffstat (limited to 'sys-apps/fwupd')
| -rw-r--r-- | sys-apps/fwupd/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch | 77 | ||||
| -rw-r--r-- | sys-apps/fwupd/fwupd-1.3.2.ebuild | 1 | ||||
| -rw-r--r-- | sys-apps/fwupd/fwupd-1.3.3-r1.ebuild (renamed from sys-apps/fwupd/fwupd-1.3.3.ebuild) | 7 |
4 files changed, 8 insertions, 82 deletions
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 07aeb8680f28..35474f4ca960 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,4 +1,3 @@ -AUX fwupd-1.2.9-without_systemd_build_fix.patch 2232 BLAKE2B 9cdd0466f4d9e86f823ddd1cfd3d899545cccd4ecf933cb48447a5010cd67ede434834ebfb348f457404da2f10395f2987e56afa3549432bff53380236eccac0 SHA512 29790db66320547fd1046f5f05d0485c54d984be8e0394bba5e8a64dbb73328639896840ece42d4d252d48a2a9c30fe599e0b064491ed16bb7b028ee18f6484b AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154 @@ -6,6 +5,6 @@ DIST fwupd-1.3.2.tar.gz 2100817 BLAKE2B 49441603ac0934a10b730b82b4f86cbdac03c3ab DIST fwupd-1.3.3.tar.gz 2125604 BLAKE2B 4471d270ec7f99857dd811b2ba9d8f591a0787ee7ad2bf45edff90904483b8fe54483cde2722e7ee9afb426b17b4d4090f6935b3fa2712a277d058802fc2e9f5 SHA512 b8f0d88fa9c1c8219dd040775d76207f1be87294ebb5f38043b77a670a1601cc597a711f5635aa3d164a08ee0dd068dd22514acae96f6fc5ad20d35099d02f50 EBUILD fwupd-1.2.11.ebuild 3768 BLAKE2B 5a9b07a619542ad0f4e778bbbc54928aa345fa3b6995ebc29c05c72e445a1a88fe5b03cd896f59c71346acb55aff00258ab2ec2678bd5895986514fbf427ce40 SHA512 aeda057c4dab66bf0bac38413cf8ff93e6036c902e8037994978925156dfda1d4f6d3431d33d54f7faca8d5509311e4b134848e5d71d51e2f6deb80165183943 EBUILD fwupd-1.2.8.ebuild 3656 BLAKE2B 4f219b26d50bc3fd9560ec8684a3629f788f92f6b9fa15ef1d948302f40f6194191b4a7d0a9891a5b8d5973d75d575df3d48c27e49733f32a0c8454af0c621d6 SHA512 224bcb6a1b84676695992bdcdcb6d28892b8068ad4f4a09d5b7bad50fba77902c4b10d172e705aa703195f80a0b879cb8322c9f5bb08a9610c502432e6908c5d -EBUILD fwupd-1.3.2.ebuild 3816 BLAKE2B 26454756617c530a9b9d2c686e51ad19187ed29ecb32775780dbb95656a5479ea8c3e294c93bbbce56c1db89e761ba2059d2aaa9147ed875ab5961eb694f286d SHA512 e62c310ba101ae3dac52c9ddf971fc96cd30c0633b9da26debb1cfcf12d28b2d3ee11a931303dd1f68d7a7247fafb57737934661391081ae3da274d8c93da083 -EBUILD fwupd-1.3.3.ebuild 3817 BLAKE2B e3d8b2d52dc643af9cf4ea301c32f790d76f22c958269ebe9f5d7e9702bba2f794713e77425ec7b9ad980065fbfd56f625ce2d584052dd49da63e8501c9aef85 SHA512 9916bac5e22301339255bd3dd63d58c8e518e04deeb0f0dd22b385708a3b07f4462589622ff08a573b6d8d0d7989b217469c0cf0ca95400d1e501de46b2dd7cd +EBUILD fwupd-1.3.2.ebuild 3844 BLAKE2B 841247f22be46bc8fe07f2dfd7768027782262b8042ce7c09c0f16019266c4d3b9c48741f0f58700171a746b4aea4c4f0b1ff618913d2d619641f72d7e647af9 SHA512 9b7d7396dede2dad6fb7cb75f2528bd85ada0dabaaa6c87cd13ef7a6c01f376d32d098c17f833d77e79931c0ecf4abe46d07bfe615a7f55a99d26c450e1df4e8 +EBUILD fwupd-1.3.3-r1.ebuild 3961 BLAKE2B cd73af45cd3c45c8b98aadba4a12ddd6aca773a68048bea1330f09a73919c94eca3c7d9e375fa6199f30d0e9701cdf2ce29552de0d5c354a8be88767ffa0549f SHA512 7cee94266bb8d1f3c0ae9d9b447b6988b4f96231042eaabadd000765e13d4e0510a3bd0823cf1176a5f2a51a38b4c46da94981e5ba8f7eea258316070107e3e0 MISC metadata.xml 1333 BLAKE2B 7978d7232cd10e4fd6d19684077dd1ba1a7db10c4869bfffcb7bc6410134da36572bccc21bd00ed29671513f3ea1323bec4dac15fdbb94e22adf523fdcd90fae SHA512 188a5b54787b8b41a0101ec580a59e0edebb94db65c4360bfc3dd108458a8ea80d43873a1109075bdac15beb77034d3a1d4d118a29235da6c74faed5111355f7 diff --git a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch deleted file mode 100644 index 37be190d8aa1..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch +++ /dev/null @@ -1,77 +0,0 @@ -From d92cccaf1396d93f97480f32694372b8256f9b11 Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Mon, 20 May 2019 11:28:31 +0100 -Subject: [PATCH] trivial: Fix non-systemd build - ---- - src/fu-tool.c | 2 ++ - src/fu-util-common.c | 5 ++++- - src/fu-util.c | 6 +++++- - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/fu-tool.c b/src/fu-tool.c -index 353a52e88..eac7a8cc4 100644 ---- a/src/fu-tool.c -+++ b/src/fu-tool.c -@@ -113,8 +113,10 @@ fu_util_start_engine (FuUtilPrivate *priv, FuEngineLoadFlags flags, GError **err - { - g_autoptr(GError) error_local = NULL; - -+#ifdef HAVE_SYSTEMD - if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), &error_local)) - g_debug ("Failed top stop daemon: %s", error_local->message); -+#endif - if (!fu_engine_load (priv->engine, flags, error)) - return FALSE; - if (fu_engine_get_tainted (priv->engine)) { -diff --git a/src/fu-util-common.c b/src/fu-util-common.c -index 219752b1e..51e16f671 100644 ---- a/src/fu-util-common.c -+++ b/src/fu-util-common.c -@@ -28,6 +28,7 @@ fu_util_get_systemd_unit (void) - return SYSTEMD_FWUPD_UNIT; - } - -+#ifdef HAVE_SYSTEMD - static const gchar * - fu_util_get_expected_command (const gchar *target) - { -@@ -35,10 +36,12 @@ fu_util_get_expected_command (const gchar *target) - return "fwupd.fwupdmgr"; - return "fwupdmgr"; - } -+#endif - - gboolean - fu_util_using_correct_daemon (GError **error) - { -+#ifdef HAVE_SYSTEMD - g_autofree gchar *default_target = NULL; - g_autoptr(GError) error_local = NULL; - const gchar *target = fu_util_get_systemd_unit (); -@@ -58,7 +61,7 @@ fu_util_using_correct_daemon (GError **error) - fu_util_get_expected_command (target)); - return FALSE; - } -- -+#endif - return TRUE; - } - -diff --git a/src/fu-util.c b/src/fu-util.c -index c8528e71e..dec96e741 100644 ---- a/src/fu-util.c -+++ b/src/fu-util.c -@@ -2122,7 +2122,11 @@ fu_util_modify_config (FuUtilPrivate *priv, gchar **values, GError **error) - if (!fu_util_prompt_for_boolean (FALSE)) - return TRUE; - } -- return fu_systemd_unit_stop (fu_util_get_systemd_unit (), error); -+#ifdef HAVE_SYSTEMD -+ if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), error)) -+ return FALSE; -+#endif -+ return TRUE; - } - - static void diff --git a/sys-apps/fwupd/fwupd-1.3.2.ebuild b/sys-apps/fwupd/fwupd-1.3.2.ebuild index b1c77f7d52de..a3a5324b96da 100644 --- a/sys-apps/fwupd/fwupd-1.3.2.ebuild +++ b/sys-apps/fwupd/fwupd-1.3.2.ebuild @@ -87,6 +87,7 @@ RDEPEND=" " pkg_setup() { + python-single-r1_pkg_setup if use nvme; then kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" fi diff --git a/sys-apps/fwupd/fwupd-1.3.3.ebuild b/sys-apps/fwupd/fwupd-1.3.3-r1.ebuild index 71773bc2c483..684e4c548a49 100644 --- a/sys-apps/fwupd/fwupd-1.3.3.ebuild +++ b/sys-apps/fwupd/fwupd-1.3.3-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit linux-info meson python-single-r1 vala xdg +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" @@ -87,6 +87,9 @@ RDEPEND=" " pkg_setup() { + tc-ld-disable-gold # bug https://github.com/fwupd/fwupd/issues/1530 + + python-single-r1_pkg_setup if use nvme; then kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" fi @@ -126,7 +129,7 @@ src_configure() { # Dependencies are not available (yet?) -Dplugin_modem_manager="false" ) - + export CACHE_DIRECTORY="${T}" meson_src_configure } |