mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
gnome-keyring: upgrade 42.1 -> 46.1
0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch refreshed for 46.1 Changelog: ========= * ssh-agent: avoid deadlock when agent process dies before we connect to it * gkm: fix test-sexp with GCC 14 * Updated translations Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
e92ddc52ab
commit
efc0e57745
|
|
@ -1,4 +1,4 @@
|
|||
From e6464e01bc1cdf5496be2942d1bac41aa609f47e Mon Sep 17 00:00:00 2001
|
||||
From 647f3d946ec3fe4800b2bec89371f85a1a4b15cf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 23 May 2019 23:44:06 +0200
|
||||
Subject: [PATCH] Set paths to ssh-agent and ssh-add by configure options
|
||||
|
|
@ -11,15 +11,16 @@ We have no executables in our sysroot so configuration won't find them.
|
|||
Upstream-Status: Inappropriate [OE specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
|
||||
---
|
||||
configure.ac | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4b83664..eda0c96 100644
|
||||
index f4f793c..5194e5d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -351,8 +351,15 @@ if test "$enable_ssh_agent" = "no"; then
|
||||
@@ -356,8 +356,15 @@ if test "$enable_ssh_agent" = "no"; then
|
||||
SSH_AGENT=false
|
||||
SSH_ADD=false
|
||||
else
|
||||
|
|
@ -37,6 +38,3 @@ index 4b83664..eda0c96 100644
|
|||
if test "$SSH_AGENT" = "no" -o "$SSH_ADD" = "no"; then
|
||||
AC_MSG_ERROR([the ssh-agent and ssh-add commands were not found])
|
||||
else
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ inherit gnomebase gsettings features_check gettext
|
|||
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
|
||||
SRC_URI[archive.sha256sum] = "c7f4d040cc76a6b7fe67e08ef9106911c3c80d40fc88cbfc8e2684a4c946e3e6"
|
||||
SRC_URI[archive.sha256sum] = "b1d3ae9132ff2f8b3f25a190790892968e3d0acf952a487e40f644a8550ce3f6"
|
||||
SRC_URI += " \
|
||||
file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \
|
||||
file://musl.patch \
|
||||
Loading…
Reference in New Issue
Block a user