diff options
-rw-r--r-- | meta/lib/oeqa/selftest/cases/oescripts.py | 9 | ||||
-rw-r--r-- | meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch (renamed from meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch) | 13 | ||||
-rw-r--r-- | meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch (renamed from meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-support/pinentry/pinentry_1.2.1.bb (renamed from meta/recipes-support/pinentry/pinentry_1.2.0.bb) | 5 |
4 files changed, 13 insertions, 14 deletions
diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index ea08d9aff8..5b0691a9ff 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py | |||
@@ -148,7 +148,7 @@ class OEListPackageconfigTests(OEScriptTests): | |||
148 | results = runCmd('%s/contrib/list-packageconfig-flags.py' % self.scripts_dir) | 148 | results = runCmd('%s/contrib/list-packageconfig-flags.py' % self.scripts_dir) |
149 | expected_endlines = [] | 149 | expected_endlines = [] |
150 | expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS") | 150 | expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS") |
151 | expected_endlines.append("pinentry gtk2 libcap ncurses qt secret") | 151 | expected_endlines.append("pinentry gtk2 ncurses qt secret") |
152 | expected_endlines.append("tar acl selinux") | 152 | expected_endlines.append("tar acl selinux") |
153 | 153 | ||
154 | self.check_endlines(results, expected_endlines) | 154 | self.check_endlines(results, expected_endlines) |
@@ -166,11 +166,10 @@ class OEListPackageconfigTests(OEScriptTests): | |||
166 | def test_packageconfig_flags_option_all(self): | 166 | def test_packageconfig_flags_option_all(self): |
167 | results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir) | 167 | results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir) |
168 | expected_endlines = [] | 168 | expected_endlines = [] |
169 | expected_endlines.append("pinentry-1.2.0") | 169 | expected_endlines.append("pinentry-1.2.1") |
170 | expected_endlines.append("PACKAGECONFIG ncurses libcap") | 170 | expected_endlines.append("PACKAGECONFIG ncurses") |
171 | expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase") | 171 | expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase") |
172 | expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0") | 172 | expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0") |
173 | expected_endlines.append("PACKAGECONFIG[libcap] --with-libcap, --without-libcap, libcap") | ||
174 | expected_endlines.append("PACKAGECONFIG[ncurses] --enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses") | 173 | expected_endlines.append("PACKAGECONFIG[ncurses] --enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses") |
175 | expected_endlines.append("PACKAGECONFIG[secret] --enable-libsecret, --disable-libsecret, libsecret") | 174 | expected_endlines.append("PACKAGECONFIG[secret] --enable-libsecret, --disable-libsecret, libsecret") |
176 | 175 | ||
@@ -180,7 +179,7 @@ class OEListPackageconfigTests(OEScriptTests): | |||
180 | results = runCmd('%s/contrib/list-packageconfig-flags.py -p' % self.scripts_dir) | 179 | results = runCmd('%s/contrib/list-packageconfig-flags.py -p' % self.scripts_dir) |
181 | expected_endlines = [] | 180 | expected_endlines = [] |
182 | expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS") | 181 | expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS") |
183 | expected_endlines.append("pinentry gtk2 libcap ncurses qt secret") | 182 | expected_endlines.append("pinentry gtk2 ncurses qt secret") |
184 | 183 | ||
185 | self.check_endlines(results, expected_endlines) | 184 | self.check_endlines(results, expected_endlines) |
186 | 185 | ||
diff --git a/meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch index 507c0c3917..bb7e43b1e7 100644 --- a/meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch +++ b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 54a4c9d3e5f1897ed4b978d5cdee646ca7a4f637 Mon Sep 17 00:00:00 2001 | 1 | From 785777dc0bc6b69ff68c91547ec6b6634049662f Mon Sep 17 00:00:00 2001 |
2 | From: Armin Kuster <akuster@mvista.com> | 2 | From: Armin Kuster <akuster@mvista.com> |
3 | Date: Fri, 2 Sep 2005 11:50:01 +0000 | 3 | Date: Fri, 2 Sep 2005 11:50:01 +0000 |
4 | Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and | 4 | Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and |
@@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific] | |||
11 | Signed-off-by: Armin Kuster <akuster@mvista.com> | 11 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
12 | 12 | ||
13 | --- | 13 | --- |
14 | m4/gpg-error.m4 | 159 ++---------------------------------------------- | 14 | m4/gpg-error.m4 | 160 ++---------------------------------------------- |
15 | 1 file changed, 4 insertions(+), 155 deletions(-) | 15 | 1 file changed, 4 insertions(+), 156 deletions(-) |
16 | 16 | ||
17 | diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 | 17 | diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 |
18 | index 56a5d07..c0bec1f 100644 | 18 | index 4b5cd40..7dfbb83 100644 |
19 | --- a/m4/gpg-error.m4 | 19 | --- a/m4/gpg-error.m4 |
20 | +++ b/m4/gpg-error.m4 | 20 | +++ b/m4/gpg-error.m4 |
21 | @@ -26,159 +26,12 @@ dnl config script does not match the host specification the script | 21 | @@ -26,160 +26,12 @@ dnl config script does not match the host specification the script |
22 | dnl is added to the gpg_config_script_warn variable. | 22 | dnl is added to the gpg_config_script_warn variable. |
23 | dnl | 23 | dnl |
24 | AC_DEFUN([AM_PATH_GPG_ERROR], | 24 | AC_DEFUN([AM_PATH_GPG_ERROR], |
@@ -135,6 +135,7 @@ index 56a5d07..c0bec1f 100644 | |||
135 | - fi | 135 | - fi |
136 | - elif test "$GPG_ERROR_CONFIG" != "no"; then | 136 | - elif test "$GPG_ERROR_CONFIG" != "no"; then |
137 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` | 137 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` |
138 | - unset GPGRT_CONFIG | ||
138 | - fi | 139 | - fi |
139 | - if test "$GPG_ERROR_CONFIG" != "no"; then | 140 | - if test "$GPG_ERROR_CONFIG" != "no"; then |
140 | - req_major=`echo $min_gpg_error_version | \ | 141 | - req_major=`echo $min_gpg_error_version | \ |
@@ -182,7 +183,7 @@ index 56a5d07..c0bec1f 100644 | |||
182 | if test x"$gpg_error_config_host" != xnone ; then | 183 | if test x"$gpg_error_config_host" != xnone ; then |
183 | if test x"$gpg_error_config_host" != x"$host" ; then | 184 | if test x"$gpg_error_config_host" != x"$host" ; then |
184 | AC_MSG_WARN([[ | 185 | AC_MSG_WARN([[ |
185 | @@ -193,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], | 186 | @@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], |
186 | fi | 187 | fi |
187 | fi | 188 | fi |
188 | else | 189 | else |
diff --git a/meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch index f4aec2d1c3..f4aec2d1c3 100644 --- a/meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch +++ b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch | |||
diff --git a/meta/recipes-support/pinentry/pinentry_1.2.0.bb b/meta/recipes-support/pinentry/pinentry_1.2.1.bb index e6cc71a547..7daf80f36e 100644 --- a/meta/recipes-support/pinentry/pinentry_1.2.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.2.1.bb | |||
@@ -16,14 +16,13 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | |||
16 | file://gpg-error_pkconf.patch \ | 16 | file://gpg-error_pkconf.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470" | 19 | SRC_URI[sha256sum] = "457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067" |
20 | 20 | ||
21 | inherit autotools pkgconfig | 21 | inherit autotools pkgconfig |
22 | 22 | ||
23 | PACKAGECONFIG ??= "ncurses libcap" | 23 | PACKAGECONFIG ??= "ncurses" |
24 | 24 | ||
25 | PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" | 25 | PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" |
26 | PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" | ||
27 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" | 26 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" |
28 | PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" | 27 | PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" |
29 | 28 | ||