Skip to content

Commit

Permalink
fix: buildkit doesn't like pushing totally empty images
Browse files Browse the repository at this point in the history
Fix that by pushing empty directory for u-boot and raspberrypi-firmware
on amd64.

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
  • Loading branch information
smira authored and talos-bot committed Dec 10, 2020
1 parent 17cfcf4 commit f5baaab
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
8 changes: 6 additions & 2 deletions raspberrypi-firmware/pkg.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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:
# {{ if eq .ARCH "aarch64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr restricting build to arm64 only
- sources:
- url: https://github.com/raspberrypi/firmware/archive/1.20201022.tar.gz
destination: raspberrypi-firmware.tar.gz
Expand All @@ -18,7 +18,11 @@ steps:
- |
mkdir -p /rootfs/boot
cp -av raspberrypi-firmware/* /rootfs/boot/
# {{ else }}
- install:
- |
mkdir -p /rootfs
# {{ end }}
finalize:
- from: /rootfs
to: /
# {{ end }}
8 changes: 6 additions & 2 deletions u-boot/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
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:
# {{ if eq .ARCH "aarch64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr restricting build to arm64 only
- sources:
- url: https://github.com/ARM-software/arm-trusted-firmware/archive/v2.4.tar.gz
destination: arm-trusted-firmware.tar.gz
Expand Down Expand Up @@ -115,7 +115,11 @@ steps:
- |
mkdir -p /rootfs/bananapi_m64
cp -v ${BANANAPI_M64_U_BOOT}/u-boot-sunxi-with-spl.bin /rootfs/bananapi_m64
# {{ else }}
- install:
- |
mkdir -p /rootfs
# {{ end }}
finalize:
- from: /rootfs
to: /
# {{ end }}

0 comments on commit f5baaab

Please sign in to comment.