mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-11-08 12:22:15 +01:00
3ef8719e4a
- replace no-quadlet.patch with more general no-systemd.patch - replace slirp4netns dependecy with passt as "The default tool for rootless networking has been swapped from slirp4netns to pasta for improved performance." - add post-upgrade message
55 lines
2.9 KiB
Diff
55 lines
2.9 KiB
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -119,7 +119,6 @@ LDFLAGS_PODMAN ?= \
|
|
$(if $(BUILD_INFO),-X $(LIBPOD)/define.buildInfo=$(BUILD_INFO),) \
|
|
-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 ?= \
|
|
@@ -235,7 +234,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 podmansh rootlessport quadlet ## Build podman, podman-remote and rootlessport binaries quadlet
|
|
+binaries: podman podman-remote podmansh rootlessport ## Build podman, podman-remote and rootlessport binaries
|
|
endif
|
|
|
|
# Extract text following double-# for targets, as their description for
|
|
@@ -548,7 +547,6 @@ man-page-check: bin/podman
|
|
hack/man-page-checker
|
|
hack/xref-helpmsgs-manpages
|
|
hack/man-page-table-check
|
|
- hack/xref-quadlet-docs
|
|
|
|
.PHONY: swagger-check
|
|
swagger-check:
|
|
@@ -841,13 +839,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.modules-load
|
|
@@ -884,12 +875,9 @@ install.docker:
|
|
env BINDIR=${BINDIR} ETCDIR=${ETCDIR} envsubst < 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:
|