mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 19:29:53 +03:00
19a9d0085c
https://github.com/containers/podman/releases/tag/v5.4.0 https://github.com/containers/podman/releases/tag/v5.4.1 https://github.com/containers/podman/releases/tag/v5.4.2
65 lines
3.3 KiB
Diff
65 lines
3.3 KiB
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -122,7 +122,6 @@ LDFLAGS_PODMAN ?= \
|
|
$(if $(BUILD_ORIGIN),-X "$(LIBPOD)/define.buildOrigin=$(BUILD_ORIGIN)",) \
|
|
-X $(LIBPOD)/config._installPrefix=$(PREFIX) \
|
|
-X $(LIBPOD)/config._etcDir=$(ETCDIR) \
|
|
- -X $(PROJECT)/v5/pkg/systemd/quadlet._binDir=$(BINDIR) \
|
|
-X github.com/containers/common/pkg/config.additionalHelperBinariesDir=$(HELPER_BINARIES_DIR)\
|
|
$(EXTRA_LDFLAGS)
|
|
LDFLAGS_PODMAN_STATIC ?= \
|
|
@@ -237,7 +236,7 @@ binaries: podman podman-remote ## Build
|
|
else ifneq (, $(findstring $(GOOS),darwin windows))
|
|
binaries: podman-remote ## Build podman-remote (client) only binaries
|
|
else
|
|
-binaries: podman podman-remote podman-testing podmansh rootlessport quadlet ## Build podman, podman-remote and rootlessport binaries quadlet
|
|
+binaries: podman podman-remote podman-testing podmansh rootlessport ## Build podman, podman-remote and rootlessport binaries
|
|
endif
|
|
|
|
# Extract text following double-# for targets, as their description for
|
|
@@ -600,7 +599,7 @@ podman-remote-%-docs: podman-remote
|
|
$(if $(findstring windows,$*),docs/source/markdown,docs/build/man)
|
|
|
|
.PHONY: man-page-check
|
|
-man-page-check: man-page-checker xref-helpmsgs-manpages xref-quadlet-docs xref-quadlet-docs
|
|
+man-page-check: man-page-checker xref-helpmsgs-manpages
|
|
|
|
man-page-checker: bin/podman docs
|
|
hack/man-page-checker
|
|
@@ -611,9 +610,6 @@ xref-helpmsgs-manpages: bin/podman docs
|
|
man-page-table-check: docs
|
|
hack/man-page-table-check
|
|
|
|
-xref-quadlet-docs: docs
|
|
- hack/xref-quadlet-docs
|
|
-
|
|
.PHONY: swagger-check
|
|
swagger-check:
|
|
hack/swagger-check
|
|
@@ -918,13 +914,6 @@ install.bin:
|
|
ifneq ($(shell uname -s),FreeBSD)
|
|
install ${SELINUXOPT} -m 755 bin/rootlessport $(DESTDIR)$(LIBEXECPODMAN)/rootlessport
|
|
test -z "${SELINUXOPT}" || chcon --verbose --reference=$(DESTDIR)$(LIBEXECPODMAN)/rootlessport bin/rootlessport
|
|
- install ${SELINUXOPT} -m 755 bin/quadlet $(DESTDIR)$(LIBEXECPODMAN)/quadlet
|
|
- install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(SYSTEMDGENERATORSDIR)
|
|
- ln -sfr $(DESTDIR)$(LIBEXECPODMAN)/quadlet $(DESTDIR)$(SYSTEMDGENERATORSDIR)/podman-system-generator
|
|
- install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(USERSYSTEMDGENERATORSDIR)
|
|
- ln -sfr $(DESTDIR)$(LIBEXECPODMAN)/quadlet $(DESTDIR)$(USERSYSTEMDGENERATORSDIR)/podman-user-generator
|
|
- install ${SELINUXOPT} -m 755 -d $(DESTDIR)${TMPFILESDIR}
|
|
- install ${SELINUXOPT} -m 644 contrib/tmpfile/podman.conf $(DESTDIR)${TMPFILESDIR}/podman.conf
|
|
endif
|
|
|
|
.PHONY: install.testing
|
|
@@ -968,12 +957,9 @@ install.docker:
|
|
env BINDIR=${BINDIR} ETCDIR=${ETCDIR} envsubst '$$BINDIR;$$ETCDIR' < docker/docker.in > ${INTERPOLATED_DOCKER_SCRIPT}
|
|
install ${SELINUXOPT} -m 755 ${INTERPOLATED_DOCKER_SCRIPT} $(DESTDIR)$(BINDIR)/docker
|
|
rm ${INTERPOLATED_DOCKER_SCRIPT}
|
|
- install ${SELINUXOPT} -m 755 -d $(DESTDIR)${SYSTEMDDIR} $(DESTDIR)${USERSYSTEMDDIR} $(DESTDIR)${TMPFILESDIR} $(DESTDIR)${USERTMPFILESDIR}
|
|
install ${SELINUXOPT} -d -m 755 $(DESTDIR)${ETCDIR}/profile.d
|
|
install ${SELINUXOPT} -m 644 docker/podman-docker.sh $(DESTDIR)${ETCDIR}/profile.d/podman-docker.sh
|
|
install ${SELINUXOPT} -m 644 docker/podman-docker.csh $(DESTDIR)${ETCDIR}/profile.d/podman-docker.csh
|
|
- install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t $(DESTDIR)${TMPFILESDIR}
|
|
- install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t $(DESTDIR)${USERTMPFILESDIR}
|
|
|
|
.PHONY: install.docker-docs
|
|
install.docker-docs:
|