Skip to content

Commit

Permalink
Merge pull request #958 from marquiz/devel/cross-tar
Browse files Browse the repository at this point in the history
Makefile: dynamically linked binary-dist
  • Loading branch information
klihub committed Dec 14, 2022
2 parents e284cbb + 4296610 commit e1942d1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ binary-dist:
echo "Creating binary dist tarball $$tarball..."; \
tardir=binary-dist; \
rm -fr $$tarball* $$tardir && \
$(MAKE) STATIC=1 DESTDIR=$$tardir \
$(MAKE) DESTDIR=$$tardir \
BUILD_DIRS=cri-resmgr \
PREFIX=/opt/intel \
DEFAULTDIR=/etc/default \
Expand Down Expand Up @@ -664,7 +664,7 @@ cross-tar cross-tarball: dist docker/cross-build/fedora
-v $$(pwd)/$$builddir:/build \
-v $$(pwd)/$$outdir:/output \
-v "`go env GOMODCACHE`:/home/$$USER/go/pkg/mod" \
fedora-build /bin/bash -c '$(DOCKER_TAR_BUILD)' && \
centos-7-build /bin/bash -c '$(DOCKER_TAR_BUILD)' && \
rm -fr $$builddir

# Build a docker image (for distro cross-building).
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cross-build/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG USER_OPTIONS=""
ENV PATH /go/bin:/usr/local/go/bin:$PATH

RUN dnf install -y rpm-build systemd-rpm-macros \
kernel-devel gcc clang glibc-static \
kernel-devel gcc clang \
git-core make wget

RUN arch="$(rpm --eval %{_arch})"; \
Expand Down

0 comments on commit e1942d1

Please sign in to comment.