diff options
-rw-r--r-- | meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch | 26 | ||||
-rw-r--r-- | meta-oe/recipes-extended/volume_key/volume-key_0.3.10.bb (renamed from meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb) | 5 |
2 files changed, 15 insertions, 16 deletions
diff --git a/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch b/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch index 03edb13909..7fc76ab2f9 100644 --- a/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch +++ b/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 18415c0b4c6e50ed9b99dfdae8d210590d0ab72e Mon Sep 17 00:00:00 2001 | 1 | From 968c7506bea3b8d66e18a562d8b8491172631b37 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: Fri, 28 Apr 2017 04:50:30 -0400 | 3 | Date: Fri, 28 Apr 2017 04:50:30 -0400 |
4 | Subject: [PATCH] explicitly support python3 by pkg-config | 4 | Subject: [PATCH] explicitly support python3 by pkg-config |
@@ -9,13 +9,14 @@ use pkg-config to replace | |||
9 | Upstream-Status: Inappropriate [wr-installer specific] | 9 | Upstream-Status: Inappropriate [wr-installer specific] |
10 | 10 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | Makefile.am | 5 ++--- | 14 | Makefile.am | 5 ++--- |
14 | configure.ac | 2 ++ | 15 | configure.ac | 2 ++ |
15 | 2 files changed, 4 insertions(+), 3 deletions(-) | 16 | 2 files changed, 4 insertions(+), 3 deletions(-) |
16 | 17 | ||
17 | diff --git a/Makefile.am b/Makefile.am | 18 | diff --git a/Makefile.am b/Makefile.am |
18 | index 4569bbf..7a8daf4 100644 | 19 | index 68560b1..ee2b4dc 100644 |
19 | --- a/Makefile.am | 20 | --- a/Makefile.am |
20 | +++ b/Makefile.am | 21 | +++ b/Makefile.am |
21 | @@ -20,7 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 | 22 | @@ -20,7 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 |
@@ -39,18 +40,15 @@ index 4569bbf..7a8daf4 100644 | |||
39 | 40 | ||
40 | src_volume_key_SOURCES = src/volume_key.c | 41 | src_volume_key_SOURCES = src/volume_key.c |
41 | diff --git a/configure.ac b/configure.ac | 42 | diff --git a/configure.ac b/configure.ac |
42 | index ff35dd0..0928a6c 100644 | 43 | index 40c3906..16c067d 100644 |
43 | --- a/configure.ac | 44 | --- a/configure.ac |
44 | +++ b/configure.ac | 45 | +++ b/configure.ac |
45 | @@ -27,6 +27,8 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz no-define subdir-objects -Wall]) | 46 | @@ -31,6 +31,8 @@ LT_INIT([disable-static]) |
46 | AC_PROG_CC | 47 | AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2 python, [Python is required]) |
47 | AM_PROG_CC_C_O | 48 | AM_PATH_PYTHON([2.6], [], AC_MSG_ERROR([Python 2.6 or 2.7 is required])) |
48 | LT_INIT([disable-static]) | ||
49 | + | ||
50 | +PKG_CHECK_MODULES(python3, [python3]) | ||
51 | AM_PATH_PYTHON | ||
52 | 49 | ||
53 | dnl Not gpg2, it cannot receive passphrases from gpgme | 50 | +PKG_CHECK_MODULES(python3, [python3]) |
54 | -- | 51 | + |
55 | 2.8.1 | 52 | AC_PATH_PROG([GPG], [gpg2]) |
56 | 53 | AC_ARG_VAR([GPG]) | |
54 | AC_DEFINE_UNQUOTED([GPG_PATH], "$GPG", [Path to the gpg2 executable]) | ||
diff --git a/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb b/meta-oe/recipes-extended/volume_key/volume-key_0.3.10.bb index febf3f256d..e8d20553fb 100644 --- a/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb +++ b/meta-oe/recipes-extended/volume_key/volume-key_0.3.10.bb | |||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
11 | SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \ | 11 | SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \ |
12 | file://0001-explicitly-support-python3-by-pkg-config.patch \ | 12 | file://0001-explicitly-support-python3-by-pkg-config.patch \ |
13 | " | 13 | " |
14 | SRC_URI[md5sum] = "a2d14931177c660e1f3ebbcf5f47d8e2" | 14 | SRC_URI[md5sum] = "605fd99a6e42916728020562a6edee78" |
15 | SRC_URI[sha256sum] = "450a54fe9bf56acec6850c1e71371d3e4913c9ca1ef0cdc3a517b4b6910412a6" | 15 | SRC_URI[sha256sum] = "c5729de7e33e39c8674e9aae2337d2719f9298d6499f1656d0d25a065a7e98a7" |
16 | 16 | ||
17 | SRCNAME = "volume_key" | 17 | SRCNAME = "volume_key" |
18 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 18 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
@@ -25,6 +25,7 @@ DEPENDS += " \ | |||
25 | cryptsetup \ | 25 | cryptsetup \ |
26 | nss \ | 26 | nss \ |
27 | gpgme \ | 27 | gpgme \ |
28 | swig-native \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | RDEPENDS_python3-${PN} += "${PN}" | 31 | RDEPENDS_python3-${PN} += "${PN}" |