summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch10
-rw-r--r--meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb (renamed from meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb)2
2 files changed, 5 insertions, 7 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch
index 32eecf8fb7..c3c3050924 100644
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch
@@ -1,4 +1,4 @@
1From e6464e01bc1cdf5496be2942d1bac41aa609f47e Mon Sep 17 00:00:00 2001 1From 647f3d946ec3fe4800b2bec89371f85a1a4b15cf Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Thu, 23 May 2019 23:44:06 +0200 3Date: Thu, 23 May 2019 23:44:06 +0200
4Subject: [PATCH] Set paths to ssh-agent and ssh-add by configure options 4Subject: [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.
11Upstream-Status: Inappropriate [OE specific] 11Upstream-Status: Inappropriate [OE specific]
12 12
13Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 13Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
14
14--- 15---
15 configure.ac | 11 +++++++++-- 16 configure.ac | 11 +++++++++--
16 1 file changed, 9 insertions(+), 2 deletions(-) 17 1 file changed, 9 insertions(+), 2 deletions(-)
17 18
18diff --git a/configure.ac b/configure.ac 19diff --git a/configure.ac b/configure.ac
19index 4b83664..eda0c96 100644 20index f4f793c..5194e5d 100644
20--- a/configure.ac 21--- a/configure.ac
21+++ b/configure.ac 22+++ b/configure.ac
22@@ -351,8 +351,15 @@ if test "$enable_ssh_agent" = "no"; then 23@@ -356,8 +356,15 @@ if test "$enable_ssh_agent" = "no"; then
23 SSH_AGENT=false 24 SSH_AGENT=false
24 SSH_ADD=false 25 SSH_ADD=false
25 else 26 else
@@ -37,6 +38,3 @@ index 4b83664..eda0c96 100644
37 if test "$SSH_AGENT" = "no" -o "$SSH_ADD" = "no"; then 38 if test "$SSH_AGENT" = "no" -o "$SSH_ADD" = "no"; then
38 AC_MSG_ERROR([the ssh-agent and ssh-add commands were not found]) 39 AC_MSG_ERROR([the ssh-agent and ssh-add commands were not found])
39 else 40 else
40--
412.20.1
42
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb
index 65c22e6392..8df3710e6a 100644
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb
@@ -22,7 +22,7 @@ inherit gnomebase gsettings features_check gettext
22 22
23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
24 24
25SRC_URI[archive.sha256sum] = "c7f4d040cc76a6b7fe67e08ef9106911c3c80d40fc88cbfc8e2684a4c946e3e6" 25SRC_URI[archive.sha256sum] = "b1d3ae9132ff2f8b3f25a190790892968e3d0acf952a487e40f644a8550ce3f6"
26SRC_URI += " \ 26SRC_URI += " \
27 file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ 27 file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \
28 file://musl.patch \ 28 file://musl.patch \