Skip to content

Commit

Permalink
fix: build "empty" images for arm64 packages on amd64
Browse files Browse the repository at this point in the history
If we build arm64-only versions, they're pulled into the amd64 build of
Talos as well (as there's no amd64 counterpart).

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
  • Loading branch information
smira authored and talos-bot committed Dec 9, 2020
1 parent 18423fa commit 401c91a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 0 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ steps:
DOCKER_CLI_EXPERIMENTAL: enabled
commands:
- make
- make arm64
when:
event:
include:
Expand All @@ -56,7 +55,6 @@ steps:
commands:
- docker login ghcr.io --username "$${GHCR_USERNAME}" --password "$${GHCR_PASSWORD}"
- make PUSH=true
- make arm64 PUSH=true
when:
event:
exclude:
Expand Down
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ COMMON_ARGS += --platform=$(PLATFORM)
empty :=
space = $(empty) $(empty)

TARGETS = ca-certificates cni containerd cryptsetup dosfstools eudev fhs grub ipmitool iptables kernel kmod libaio libressl libseccomp linux-firmware lvm2 musl open-iscsi open-isns runc socat syslinux util-linux xfsprogs
TARGETS = ca-certificates cni containerd cryptsetup dosfstools eudev fhs grub ipmitool iptables kernel kmod libaio libressl libseccomp linux-firmware lvm2 musl open-iscsi open-isns raspberrypi-firmware runc socat syslinux u-boot util-linux xfsprogs

all: $(TARGETS) ## Builds all known pkgs.

arm64:
$(MAKE) TARGETS="u-boot raspberrypi-firmware" PLATFORM=linux/arm64

.PHONY: help
help: ## This help menu.
@grep -E '^[a-zA-Z%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
Expand Down
2 changes: 2 additions & 0 deletions raspberrypi-firmware/pkg.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: raspberrypi-firmware
variant: scratch
shell: /toolchain/bin/bash
# {{ if eq .ARCH "aarch64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr restricting build to arm64 only
dependencies:
- stage: base
steps:
Expand All @@ -20,3 +21,4 @@ steps:
finalize:
- from: /rootfs
to: /
# {{ end }}
2 changes: 2 additions & 0 deletions u-boot/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
name: u-boot
variant: scratch
shell: /toolchain/bin/bash
# {{ if eq .ARCH "aarch64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr restricting build to arm64 only
dependencies:
- stage: base
steps:
Expand Down Expand Up @@ -117,3 +118,4 @@ steps:
finalize:
- from: /rootfs
to: /
# {{ end }}

0 comments on commit 401c91a

Please sign in to comment.