summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-containers/skopeo/files/0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch8
-rw-r--r--recipes-containers/skopeo/skopeo_git.bb6
2 files changed, 7 insertions, 7 deletions
diff --git a/recipes-containers/skopeo/files/0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch b/recipes-containers/skopeo/files/0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch
index f12734c9..d8782966 100644
--- a/recipes-containers/skopeo/files/0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch
+++ b/recipes-containers/skopeo/files/0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch
@@ -1,6 +1,6 @@
1From 4f60614b51df50f5d28495cf2e270dd6ab5fea7d Mon Sep 17 00:00:00 2001 1From 1dd54dce3159f52a2d33693de95d124d1acb6ba9 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com> 2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Tue, 25 May 2021 13:42:56 -0400 3Date: Tue, 24 Aug 2021 09:25:07 -0400
4Subject: [PATCH] Makefile: use pkg-config instead of gpgme-config 4Subject: [PATCH] Makefile: use pkg-config instead of gpgme-config
5 5
6OE taints gpgme-config to produce the following flag when called: 6OE taints gpgme-config to produce the following flag when called:
@@ -18,7 +18,7 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
18 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
19 19
20diff --git a/src/import/Makefile b/src/import/Makefile 20diff --git a/src/import/Makefile b/src/import/Makefile
21index 6bacd12e..8a94b236 100644 21index 5721b06d..31875d44 100644
22--- a/src/import/Makefile 22--- a/src/import/Makefile
23+++ b/src/import/Makefile 23+++ b/src/import/Makefile
24@@ -8,7 +8,7 @@ export GOPROXY=https://proxy.golang.org 24@@ -8,7 +8,7 @@ export GOPROXY=https://proxy.golang.org
@@ -28,7 +28,7 @@ index 6bacd12e..8a94b236 100644
28-GPGME_ENV := CGO_CFLAGS="$(shell gpgme-config --cflags 2>/dev/null)" CGO_LDFLAGS="$(shell gpgme-config --libs 2>/dev/null)" 28-GPGME_ENV := CGO_CFLAGS="$(shell gpgme-config --cflags 2>/dev/null)" CGO_LDFLAGS="$(shell gpgme-config --libs 2>/dev/null)"
29+GPGME_ENV := CGO_CFLAGS="$(shell pkg-config gpgme --cflags 2>/dev/null)" CGO_LDFLAGS="$(shell pkg-config gpgme --libs 2>/dev/null)" 29+GPGME_ENV := CGO_CFLAGS="$(shell pkg-config gpgme --cflags 2>/dev/null)" CGO_LDFLAGS="$(shell pkg-config gpgme --libs 2>/dev/null)"
30 30
31 # Normally empty, DESTDIR can be used to relocate the entire install-tree 31 # The following variables very roughly follow https://www.gnu.org/prep/standards/standards.html#Makefile-Conventions .
32 DESTDIR ?= 32 DESTDIR ?=
33-- 33--
342.19.1 342.19.1
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index 7d2a9c13..39ee8ca6 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -21,14 +21,14 @@ RDEPENDS:${PN} = " \
21" 21"
22 22
23SRC_URI = " \ 23SRC_URI = " \
24 git://github.com/containers/skopeo;branch=release-1.3 \ 24 git://github.com/containers/skopeo;branch=release-1.4 \
25 file://0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch \ 25 file://0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch \
26 file://storage.conf \ 26 file://storage.conf \
27 file://registries.conf \ 27 file://registries.conf \
28" 28"
29 29
30SRCREV = "038f70e6f52ca354534b2d38ce9611b8fc5537c4" 30SRCREV = "01e51ce610e3cfe1230a10af982e962c4ad1c990"
31PV = "v1.3.1+git${SRCPV}" 31PV = "v1.4.1+git${SRCPV}"
32GO_IMPORT = "import" 32GO_IMPORT = "import"
33 33
34S = "${WORKDIR}/git" 34S = "${WORKDIR}/git"