From e48beb5bb1ae6d9971f18b888df0bb335d750379 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Thu, 14 Mar 2024 22:30:54 +0530 Subject: [PATCH] fix: image name Fixes the image name. Also split out into different pkgs to have better caching and folder structure. Signed-off-by: Noel Georgi --- .conform.yaml | 48 ++++++++++++++++++++++++++++++ .kres.yaml | 2 +- Makefile | 4 +-- installers/pkg.yaml | 11 +++++++ installers/rpi_generic/pkg.yaml | 6 +--- installers/rpi_generic/src/main.go | 4 +++ 6 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 .conform.yaml create mode 100644 installers/pkg.yaml diff --git a/.conform.yaml b/.conform.yaml new file mode 100644 index 0000000..9d8fcca --- /dev/null +++ b/.conform.yaml @@ -0,0 +1,48 @@ +# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. +# +# Generated on 2024-03-14T17:09:30Z by kres latest. + +policies: + - type: commit + spec: + dco: true + gpg: + required: true + identity: + gitHubOrganization: siderolabs + spellcheck: + locale: US + maximumOfOneCommit: true + header: + length: 89 + imperative: true + case: lower + invalidLastCharacters: . + body: + required: true + conventional: + types: + - chore + - docs + - perf + - refactor + - style + - test + - release + scopes: + - .* + - type: license + spec: + root: . + skipPaths: + - .git/ + - testdata/ + includeSuffixes: + - .go + excludeSuffixes: + - .pb.go + - .pb.gw.go + header: | + // This Source Code Form is subject to the terms of the Mozilla Public + // License, v. 2.0. If a copy of the MPL was not distributed with this + // file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/.kres.yaml b/.kres.yaml index 3cf25b7..f5a0578 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -2,7 +2,7 @@ kind: pkgfile.Build spec: targets: - - rpi_generic + - sbc-raspberrypi extraBuildArgs: - PKGS_PREFIX - PKGS diff --git a/Makefile b/Makefile index abbe0dd..ad624fa 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-03-12T16:46:47Z by kres latest. +# Generated on 2024-03-14T16:55:00Z by kres latest. # common variables @@ -54,7 +54,7 @@ PKGS ?= v1.7.0-alpha.0-33-g3aacf03 # targets defines all the available targets -TARGETS = rpi_generic +TARGETS = sbc-raspberrypi # help menu diff --git a/installers/pkg.yaml b/installers/pkg.yaml new file mode 100644 index 0000000..a4ee4c0 --- /dev/null +++ b/installers/pkg.yaml @@ -0,0 +1,11 @@ +name: sbc-raspberrypi +variant: scratch +dependencies: + - stage: rpi_generic + - stage: raspberrypi-firmware + - stage: u-boot + platform: linux/arm64 + - stage: profiles +finalize: + - from: /rootfs + to: / diff --git a/installers/rpi_generic/pkg.yaml b/installers/rpi_generic/pkg.yaml index 0803f62..7d5cb66 100644 --- a/installers/rpi_generic/pkg.yaml +++ b/installers/rpi_generic/pkg.yaml @@ -3,10 +3,6 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - stage: raspberrypi-firmware - - stage: u-boot - platform: linux/arm64 - - stage: profiles steps: - env: GOPATH: /go @@ -26,4 +22,4 @@ steps: cp -p /pkg/src/rpi_generic /rootfs/installers/rpi_generic finalize: - from: /rootfs - to: / + to: /rootfs diff --git a/installers/rpi_generic/src/main.go b/installers/rpi_generic/src/main.go index e0f2ba8..ecf94ed 100644 --- a/installers/rpi_generic/src/main.go +++ b/installers/rpi_generic/src/main.go @@ -1,3 +1,7 @@ +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + package main import (