diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-11-09 17:07:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-14 11:14:39 +0000 |
commit | f885c4cd7f1be3bad417a4c15b19062e47355922 (patch) | |
tree | ab88d4f34b8cf8c7d450072153fcce2bd23d48ae /meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch | |
parent | 13646cc96b1c8cb49b4ecbab9d90b60f8ce1f587 (diff) | |
download | poky-f885c4cd7f1be3bad417a4c15b19062e47355922.tar.gz |
gpgme: 1.11.1 -> 1.12.0
Rebase 0007-qt-python-Add-variables-to-tests.patch
Rework 0007-qt-python-Add-variables-to-tests.patch -> 0007-python-Add-variables-to-tests.patch
Drop newly added option --disable-lang-qt-test which is merged to --disable-gpg-test by
upstream commit [26820ba qt: Respect --disable-gpg-test for tests]
(From OE-Core rev: 9457163b2c4982a64814c6b38c292d7bc61ff643)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index 330bec659b..de1689ec05 100644 --- a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 60baf9ebf30bed0e2ee3c7c5a74d5b6d50035862 Mon Sep 17 00:00:00 2001 | 1 | From f632148fcc8757bb9a9601a6dab275e88cd309d2 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 30 Jan 2018 15:28:49 +0800 | 3 | Date: Tue, 30 Jan 2018 15:28:49 +0800 |
4 | Subject: [PATCH 3/7] Correctly install python modules | 4 | Subject: [PATCH 3/7] Correctly install python modules |
@@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
17 | 1 file changed, 1 insertion(+) | 17 | 1 file changed, 1 insertion(+) |
18 | 18 | ||
19 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am | 19 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am |
20 | index 8d74cbd..ce4f0a5 100644 | 20 | index 6988faf..36c6f7b 100644 |
21 | --- a/lang/python/Makefile.am | 21 | --- a/lang/python/Makefile.am |
22 | +++ b/lang/python/Makefile.am | 22 | +++ b/lang/python/Makefile.am |
23 | @@ -91,6 +91,7 @@ install-exec-local: | 23 | @@ -93,6 +93,7 @@ install-exec-local: |
24 | --build-base="$$(basename "$${PYTHON}")-gpg" \ | 24 | --build-base="$$(basename "$${PYTHON}")-gpg" \ |
25 | install \ | 25 | install \ |
26 | --prefix "$(DESTDIR)$(prefix)" \ | 26 | --prefix "$(DESTDIR)$(prefix)" \ |