Mirrored_Repos/unifios-utilities
1
0
Fork 0
mirror of https://github.com/unifi-utilities/unifios-utilities.git synced 2024-08-30 18:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update podman.Makefile.UDM-SE.patch

Browse Source
This commit is contained in:
John Dorman 2023-03-06 23:01:14 -08:00 committed by GitHub
parent ecd0509805
commit 910b50f856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
podman-update/build/podman.Makefile.UDM-SE.patch
View File

@ -1,18 +1,20 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 15d6d9fb6..8b44da6ae 100644 --- Makefile
--- a/Makefile +++ Makefile
+++ b/Makefile @@ -75,9 +75,9 @@
@@ -65,7 +65,7 @@ SOURCES = $(shell find . -path './.*' -prune -o \( -name '*.go' -a ! -name '*_te # newer than our target (bin/podman{,-remote}), a rebuild is
# triggered.
BUILDFLAGS := -mod=vendor $(BUILDFLAGS) SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print)
-BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay -BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay
+BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp $(shell hack/systemd_tag.sh) +BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper seccomp apparmor systemd libdm_no_deferred_remove
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker) CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
OCI_RUNTIME ?= "" OCI_RUNTIME ?= ""
@@ -143,16 +143,7 @@ export PATH := $(PATH):$(GOBIN) # The 'sort' below is crucial: without it, 'make docs' behaves differently
GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man') @@ -141,20 +141,9 @@
GOMD2MAN ?= $(shell command -v go-md2man || echo './test/tools/build/go-md2man')
CROSS_BUILD_TARGETS := \ CROSS_BUILD_TARGETS := \
- bin/podman.cross.linux.amd64 \ - bin/podman.cross.linux.amd64 \
@ -24,16 +26,21 @@ index 15d6d9fb6..8b44da6ae 100644
- bin/podman.cross.linux.mips \ - bin/podman.cross.linux.mips \
- bin/podman.cross.linux.mipsle \ - bin/podman.cross.linux.mipsle \
- bin/podman.cross.linux.mips64 \ - bin/podman.cross.linux.mips64 \
- bin/podman.cross.linux.mips64le - bin/podman.cross.linux.mips64le \
- bin/podman.cross.freebsd.amd64 \
- bin/podman.cross.freebsd.arm64
# Dereference variable $(1), return value if non-empty, otherwise raise an error. # Dereference variable $(1), return value if non-empty, otherwise raise an error.
err_if_empty = $(if $(strip $($(1))),$(strip $($(1))),$(error Required variable $(1) value is undefined, whitespace, or empty)) err_if_empty = $(if $(strip $($(1))),$(strip $($(1))),$(error Required variable $(1) value is undefined, whitespace, or empty))
@@ -370,7 +361,7 @@ bin/podman.cross.%: .gopathok
@@ -419,9 +408,9 @@
bin/podman.cross.%:
TARGET="$*"; \ TARGET="$*"; \
GOOS="$${TARGET%%.*}"; \ GOOS="$${TARGET%%.*}"; \
GOARCH="$${TARGET##*.}"; \ GOARCH="$${TARGET##*.}"; \
- CGO_ENABLED=0 \ - CGO_ENABLED=0 \
+ CGO_ENABLED=1 \ + CGO_ENABLED1 \
$(GO) build \ $(GO) build \
$(BUILDFLAGS) \ $(BUILDFLAGS) \
-gcflags '$(GCFLAGS)' \ $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
-tags '$(BUILDTAGS_CROSS)' \