You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2022/12/12 09:30:33 UTC
[camel-k] branch release-1.10.x updated (ff92034e4 -> 365a66291)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from ff92034e4 Merge pull request #3870 from claudio4j/fix_knativeservice_1.10.x
new 690d291c5 fix(#3800): Add proper kamel linux binary to image build on MacOS
new 365a66291 fix(#3800): Add proper kamel linux binary on MacOS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
script/Makefile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
[camel-k] 01/02: fix(#3800): Add proper kamel linux binary to image build on MacOS
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 690d291c5139358f7ded6e98d4c7ff79c0b52911
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Wed Nov 9 22:30:09 2022 +0100
fix(#3800): Add proper kamel linux binary to image build on MacOS
---
script/Makefile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/script/Makefile b/script/Makefile
index e5996b028..06293835d 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -310,9 +310,6 @@ ifeq ($(shell uname -s 2>/dev/null || echo Unknown),Linux)
else
go build $(GOFLAGS) -o kamel ./cmd/kamel/*.go
endif
-ifeq ($(shell uname -m), arm64)
- GOOS=linux GOARCH=arm64 go build $(GOFLAGS) -o kamel.linux.arm ./cmd/kamel/*.go
-endif
build-resources:
./script/get_catalog.sh $(RUNTIME_VERSION) $(STAGING_RUNTIME_REPO)
@@ -396,7 +393,15 @@ maven-overlay:
kamel-overlay:
@echo "####### Copying kamel CLI to output build directory..."
mkdir -p build/_output/bin
- cp kamel build/_output/bin
+ifeq ($(shell uname -m), arm64)
+ GOOS=linux GOARCH=arm64 go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go
+else ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux)
+ GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go
+else
+ @{ \
+ cp kamel build/_output/bin \
+ }
+endif
images: build kamel-overlay maven-overlay bundle-kamelets
@echo "####### Building Camel K operator container image..."
@@ -409,7 +414,7 @@ images-arch: build kamel-overlay maven-overlay bundle-kamelets
docker buildx rm --all-inactive --force
docker buildx create --append --name builder
ifeq ($(shell uname -m), x86_x64)
- docker buildx build --platform=linux/amd64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch .
+ docker buildx build --platform=linux/amd64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch .
endif
ifeq ($(shell uname -m), aarch64)
docker buildx build --platform=linux/arm64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch .
[camel-k] 02/02: fix(#3800): Add proper kamel linux binary on MacOS
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 365a66291fae944c9173b78042769b566e2d0b8f
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Dec 6 10:56:54 2022 +0100
fix(#3800): Add proper kamel linux binary on MacOS
- Fix tabs in Makefile
---
script/Makefile | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/script/Makefile b/script/Makefile
index 06293835d..c0fac5537 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -393,14 +393,12 @@ maven-overlay:
kamel-overlay:
@echo "####### Copying kamel CLI to output build directory..."
mkdir -p build/_output/bin
-ifeq ($(shell uname -m), arm64)
- GOOS=linux GOARCH=arm64 go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go
-else ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux)
- GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go
+ifeq ($(shell uname -s 2>/dev/null || echo Unknown),Linux)
+ cp kamel build/_output/bin
+else ifeq ($(shell uname -m), arm64)
+ GOOS=linux GOARCH=arm64 go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go
else
- @{ \
- cp kamel build/_output/bin \
- }
+ GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go
endif
images: build kamel-overlay maven-overlay bundle-kamelets
@@ -414,7 +412,7 @@ images-arch: build kamel-overlay maven-overlay bundle-kamelets
docker buildx rm --all-inactive --force
docker buildx create --append --name builder
ifeq ($(shell uname -m), x86_x64)
- docker buildx build --platform=linux/amd64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch .
+ docker buildx build --platform=linux/amd64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch .
endif
ifeq ($(shell uname -m), aarch64)
docker buildx build --platform=linux/arm64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch .