Skip to content

Commit

Permalink
merge opencontainers#4222 into opencontainers/runc:main
Browse files Browse the repository at this point in the history
lifubang (1):
  fix runc-dmz bin path error in Makefile

LGTMs: AkihiroSuda cyphar
  • Loading branch information
cyphar committed Mar 15, 2024
2 parents 1950892 + da79b61 commit e0cfcb3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static-bin: runc-dmz

.PHONY: runc-dmz
runc-dmz:
rm -f libcontainer/dmz/runc-dmz
rm -f libcontainer/dmz/binary/runc-dmz
$(GO) generate -tags "$(BUILDTAGS)" ./libcontainer/dmz

.PHONY: releaseall
Expand Down Expand Up @@ -242,12 +242,12 @@ verify-dependencies: vendor

.PHONY: verify-dmz-arch
verify-dmz-arch:
@if test -s libcontainer/dmz/runc-dmz; then \
@if test -s libcontainer/dmz/binary/runc-dmz; then \
set -Eeuo pipefail; \
export LC_ALL=C; \
diff -u \
<(readelf -h runc | grep -E "(Machine|Flags):") \
<(readelf -h libcontainer/dmz/runc-dmz | grep -E "(Machine|Flags):"); \
<(readelf -h libcontainer/dmz/binary/runc-dmz | grep -E "(Machine|Flags):"); \
fi

.PHONY: validate-keyring
Expand Down

0 comments on commit e0cfcb3

Please sign in to comment.