summaryrefslogtreecommitdiffstats
path: root/recipes-containers/podman/files
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2020-01-15 21:54:14 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-02-03 17:12:40 -0500
commit3ab5647d7cfa9d46a155be80934e0bc8a44dbf4b (patch)
tree767bbbe0b6fec7e7106f3e94dbfdb2e83c2f612b /recipes-containers/podman/files
parent002acb526310415a8e46d3e1d020622324e103cc (diff)
downloadmeta-virtualization-3ab5647d7cfa9d46a155be80934e0bc8a44dbf4b.tar.gz
podman: bump to latest release 1.6.4
Bump to latest podman release 1.6.4. The changelog lists some new features but mostly bugfixes between 1.6.1 and 1.6.4. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/podman/files')
-rw-r--r--recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch b/recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch
new file mode 100644
index 00000000..59224aff
--- /dev/null
+++ b/recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch
@@ -0,0 +1,43 @@
1From 9558797fb7bb019810d18f7acdde93adc35d02cc Mon Sep 17 00:00:00 2001
2From: Morten Linderud <morten@linderud.pw>
3Date: Sat, 2 Nov 2019 12:58:38 +0100
4Subject: [PATCH] [Makefile] Fix docker documentation install and generation
5
6The final versions of the documentation has been shifted from `docs/` to
7`docs/build/man`. Most of the Makefile has been changed accordingly, but
8the docker documentation generation was not.
9
10Introduced by #4354
11
12Signed-off-by: Morten Linderud <morten@linderud.pw>
13Upstream-Status: Backport
14Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
15---
16 Makefile | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/Makefile b/Makefile
20index 98b7bbdf..feb8e0ca 100644
21--- a/src/import/Makefile
22+++ b/src/import/Makefile
23@@ -376,7 +376,7 @@ podman-remote-%-release:
24 $(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
25
26 docker-docs: docs
27- (cd docs; ./dckrman.sh *.1)
28+ (cd docs; ./dckrman.sh ./build/man/*.1)
29
30 changelog: ## Generate changelog
31 @echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)"
32@@ -425,7 +425,7 @@ install.cni:
33 install.docker: docker-docs
34 install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
35 install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
36- install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
37+ install ${SELINUXOPT} -m 644 docs/build/man/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
38
39 install.systemd:
40 install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
41--
422.17.1
43