mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
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>
This commit is contained in:
parent
002acb5263
commit
3ab5647d7c
|
@ -0,0 +1,43 @@
|
||||||
|
From 9558797fb7bb019810d18f7acdde93adc35d02cc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Morten Linderud <morten@linderud.pw>
|
||||||
|
Date: Sat, 2 Nov 2019 12:58:38 +0100
|
||||||
|
Subject: [PATCH] [Makefile] Fix docker documentation install and generation
|
||||||
|
|
||||||
|
The final versions of the documentation has been shifted from `docs/` to
|
||||||
|
`docs/build/man`. Most of the Makefile has been changed accordingly, but
|
||||||
|
the docker documentation generation was not.
|
||||||
|
|
||||||
|
Introduced by #4354
|
||||||
|
|
||||||
|
Signed-off-by: Morten Linderud <morten@linderud.pw>
|
||||||
|
Upstream-Status: Backport
|
||||||
|
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
||||||
|
---
|
||||||
|
Makefile | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 98b7bbdf..feb8e0ca 100644
|
||||||
|
--- a/src/import/Makefile
|
||||||
|
+++ b/src/import/Makefile
|
||||||
|
@@ -376,7 +376,7 @@ podman-remote-%-release:
|
||||||
|
$(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
|
||||||
|
|
||||||
|
docker-docs: docs
|
||||||
|
- (cd docs; ./dckrman.sh *.1)
|
||||||
|
+ (cd docs; ./dckrman.sh ./build/man/*.1)
|
||||||
|
|
||||||
|
changelog: ## Generate changelog
|
||||||
|
@echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)"
|
||||||
|
@@ -425,7 +425,7 @@ install.cni:
|
||||||
|
install.docker: docker-docs
|
||||||
|
install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
|
||||||
|
install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
|
||||||
|
- install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
|
||||||
|
+ install ${SELINUXOPT} -m 644 docs/build/man/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
|
||||||
|
|
||||||
|
install.systemd:
|
||||||
|
install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
|
@ -24,9 +24,10 @@ python __anonymous() {
|
||||||
raise bb.parse.SkipRecipe(msg)
|
raise bb.parse.SkipRecipe(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
SRCREV = "233d95f4f0a815f11d1c1ae9aba16781c4eb2700"
|
SRCREV = "5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://github.com/containers/libpod.git;branch=master \
|
git://github.com/containers/libpod.git;branch=v1.6 \
|
||||||
|
file://0001-Makefile-Fix-docker-documentation-install-and-genera.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
LICENSE = "Apache-2.0"
|
LICENSE = "Apache-2.0"
|
||||||
|
@ -36,7 +37,7 @@ GO_IMPORT = "import"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
PV = "1.6.1+git${SRCREV}"
|
PV = "1.6.4+git${SRCREV}"
|
||||||
|
|
||||||
PACKAGES =+ "${PN}-contrib"
|
PACKAGES =+ "${PN}-contrib"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user