diff options
-rw-r--r-- | meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch | 54 | ||||
-rw-r--r-- | meta-oe/recipes-extended/volume_key/volume-key_0.3.11.bb (renamed from meta-oe/recipes-extended/volume_key/volume-key_0.3.10.bb) | 5 |
2 files changed, 2 insertions, 57 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 deleted file mode 100644 index 7fc76ab2f9..0000000000 --- a/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 968c7506bea3b8d66e18a562d8b8491172631b37 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 28 Apr 2017 04:50:30 -0400 -Subject: [PATCH] explicitly support python3 by pkg-config - -The PYTHON_CPPFLAGS and -lpython$(PYTHON_VERSION) is hardcoded, -use pkg-config to replace - -Upstream-Status: Inappropriate [wr-installer specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - Makefile.am | 5 ++--- - configure.ac | 2 ++ - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 68560b1..ee2b4dc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,7 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 - AM_CPPFLAGS = $(blkid_CFLAGS) $(glib_CFLAGS) $(GPGME_CFLAGS) \ - $(libcryptsetup_CFLAGS) $(nss_CFLAGS) - LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' --PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION) - - ## Targets - SUBDIRS = po -@@ -63,9 +62,9 @@ lib_libvolume_key_la_LIBADD = $(blkid_LIBS) $(glib_LIBS) $(GPGME_LIBS) \ - $(LTLIBINTL) $(libcryptsetup_LIBS) $(nss_LIBS) - - python__volume_key_la_SOURCES = python/volume_key_wrap.c --python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) -+python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(python3_CFLAGS) - python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS) --python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \ -+python__volume_key_la_LIBADD = lib/libvolume_key.la $(python3_LIBS) \ - $(glib_LIBS) $(nss_LIBS) - - src_volume_key_SOURCES = src/volume_key.c -diff --git a/configure.ac b/configure.ac -index 40c3906..16c067d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,6 +31,8 @@ LT_INIT([disable-static]) - AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2 python, [Python is required]) - AM_PATH_PYTHON([2.6], [], AC_MSG_ERROR([Python 2.6 or 2.7 is required])) - -+PKG_CHECK_MODULES(python3, [python3]) -+ - AC_PATH_PROG([GPG], [gpg2]) - AC_ARG_VAR([GPG]) - AC_DEFINE_UNQUOTED([GPG_PATH], "$GPG", [Path to the gpg2 executable]) diff --git a/meta-oe/recipes-extended/volume_key/volume-key_0.3.10.bb b/meta-oe/recipes-extended/volume_key/volume-key_0.3.11.bb index e8d20553fb..c41b20c45b 100644 --- a/meta-oe/recipes-extended/volume_key/volume-key_0.3.10.bb +++ b/meta-oe/recipes-extended/volume_key/volume-key_0.3.11.bb @@ -9,10 +9,9 @@ HOMEPAGE = "https://pagure.io/volume_key" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \ - file://0001-explicitly-support-python3-by-pkg-config.patch \ " -SRC_URI[md5sum] = "605fd99a6e42916728020562a6edee78" -SRC_URI[sha256sum] = "c5729de7e33e39c8674e9aae2337d2719f9298d6499f1656d0d25a065a7e98a7" +SRC_URI[md5sum] = "30df56c7743eb7c965293b3d61194232" +SRC_URI[sha256sum] = "e6b279c25ae477b555f938db2e41818f90c8cde942b0eec92f70b6c772095f6d" SRCNAME = "volume_key" S = "${WORKDIR}/${SRCNAME}-${PV}" |