chore: use standard PKGS variable

Use standard `PKGS` variable. Also rename `deps` to `extensions-metadata` to be more clear. Signed-off-by: Noel Georgi <git@frezbo.dev>
siderolabs · Feb 22, 2023 · 7cdf5e7 · 7cdf5e7
1 parent 1f10906
commit 7cdf5e7
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
diff --git a/.drone.yaml b/.drone.yaml
@@ -103,8 +103,8 @@ steps:
       AWS_SECRET_ACCESS_KEY:
         from_secret: 'rook_secret_access_key'
     commands:
-      - make all deps PUSH=true
-      - s3cmd --host=rook-ceph-rgw-ci-store.rook-ceph.svc --host-bucket=rook-ceph-rgw-ci-store.rook-ceph.svc --no-ssl --stats sync _out s3://${BUCKET_PATH}
+      - make all extensions-metadata PUSH=true
+      - s3cmd --host=rook-ceph-rgw-ci-store.rook-ceph.svc --host-bucket=rook-ceph-rgw-ci-store.rook-ceph.svc --no-ssl --stats sync _out/extensions-metadata s3://${BUCKET_PATH}/_out/extensions-metadata
     when:
       event:
         - promote

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ endif
 
 # keep in sync with Pkgfile
 BLDR_RELEASE ?= v0.2.0-alpha.12
-PKGS_VERSION ?= v1.4.0-alpha.0-29-g5dbce6b
+PKGS ?= v1.4.0-alpha.0-29-g5dbce6b
 
 BUILD := docker buildx build
 PLATFORM ?= linux/amd64,linux/arm64
@@ -32,7 +32,7 @@ COMMON_ARGS += --build-arg=http_proxy=$(http_proxy)
 COMMON_ARGS += --build-arg=https_proxy=$(https_proxy)
 COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
 COMMON_ARGS += --build-arg=TAG=$(TAG)
-COMMON_ARGS += --build-arg=PKGS_VERSION=$(PKGS_VERSION)
+COMMON_ARGS += --build-arg=PKGS=$(PKGS)
 
 , := ,
 empty :=
@@ -85,10 +85,10 @@ $(TARGETS) $(NONFREE_TARGETS): $(ARTIFACTS)/bldr
 	@$(MAKE) docker-$@ \
 		TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/$@:$(shell $(ARTIFACTS)/bldr eval --target $@ --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) --push=$(PUSH)"
 
-deps: $(ARTIFACTS)/bldr
-	@rm -f _out/deps
-	@$(foreach target,$(TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) >> _out/deps;)
-	@$(foreach target,$(NONFREE_TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) >> _out/deps;)
+extensions-metadata: $(ARTIFACTS)/bldr
+	@rm -f _out/extensions-metadata
+	@$(foreach target,$(TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) >> _out/extensions-metadata;)
+	@$(foreach target,$(NONFREE_TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) >> _out/extensions-metadata;)
 
 .PHONY: deps.png
 deps.png: $(ARTIFACTS)/bldr

diff --git a/drivers/gasket/pkg.yaml b/drivers/gasket/pkg.yaml
@@ -5,7 +5,7 @@ dependencies:
   - stage: base
   # The pkgs version for a particular release of Talos as defined in
   # https://github.com/siderolabs/talos/blob/<talos version>/pkg/machinery/gendata/data/pkgs
-  - image: "{{ .PKGS_PREFIX }}/gasket-driver-pkg:{{ .BUILD_ARG_PKGS_VERSION }}"
+  - image: "{{ .PKGS_PREFIX }}/gasket-driver-pkg:{{ .BUILD_ARG_PKGS }}"
 steps:
   - prepare:
       - |

diff --git a/drivers/mellanox-ofed/pkg.yaml b/drivers/mellanox-ofed/pkg.yaml
@@ -5,7 +5,7 @@ dependencies:
  - stage: base
  # The pkgs version for a particular release of Talos as defined in
  # https://github.com/siderolabs/talos/blob/<talos version>/pkg/machinery/gendata/data/pkgs
- - image: "{{ .PKGS_PREFIX }}/mellanox-ofed-pkg:{{ .BUILD_ARG_PKGS_VERSION }}"
+ - image: "{{ .PKGS_PREFIX }}/mellanox-ofed-pkg:{{ .BUILD_ARG_PKGS }}"
 steps:
   - prepare:
       - |

diff --git a/firmware/amd-ucode/pkg.yaml b/firmware/amd-ucode/pkg.yaml
@@ -3,7 +3,7 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
-  - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS_VERSION }}"
+  - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}"
 steps:
   - prepare:
       - |

diff --git a/firmware/bnx2-bnx2x/pkg.yaml b/firmware/bnx2-bnx2x/pkg.yaml
@@ -3,7 +3,7 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
-  - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS_VERSION }}"
+  - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}"
 steps:
   - prepare:
       - |

diff --git a/firmware/i915-ucode/pkg.yaml b/firmware/i915-ucode/pkg.yaml
@@ -3,7 +3,7 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
-  - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS_VERSION }}"
+  - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}"
 steps:
   - prepare:
       - |

diff --git a/internal/base/pkg.yaml b/internal/base/pkg.yaml
@@ -2,8 +2,8 @@ name: base
 variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
-  - image: "{{ .PKGS_PREFIX }}/base:{{ .BUILD_ARG_PKGS_VERSION }}"
-  - image: "{{ .PKGS_PREFIX }}/ca-certificates:{{ .BUILD_ARG_PKGS_VERSION }}"
+  - image: "{{ .PKGS_PREFIX }}/base:{{ .BUILD_ARG_PKGS }}"
+  - image: "{{ .PKGS_PREFIX }}/ca-certificates:{{ .BUILD_ARG_PKGS }}"
 finalize:
   - from: /
     to: /
diff --git a/nvidia-gpu/nvidia-modules/pkg.yaml b/nvidia-gpu/nvidia-modules/pkg.yaml
@@ -5,7 +5,7 @@ dependencies:
  - stage: base
 # The pkgs version for a particular release of Talos as defined in
 # https://github.com/siderolabs/talos/blob/<talos version>/pkg/machinery/gendata/data/pkgs
- - image: "{{ .PKGS_PREFIX }}/nvidia-open-gpu-kernel-modules-pkg:{{ .BUILD_ARG_PKGS_VERSION }}"
+ - image: "{{ .PKGS_PREFIX }}/nvidia-open-gpu-kernel-modules-pkg:{{ .BUILD_ARG_PKGS }}"
 steps:
   - prepare:
       - |

diff --git a/power/nut-client/pkg.yaml b/power/nut-client/pkg.yaml
@@ -3,8 +3,8 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
-  - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS_VERSION }}"
-  - image: "{{ .PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS_VERSION }}"
+  - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}"
+  - image: "{{ .PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}"
 steps:
   - sources:
       - url: https://github.com/networkupstools/nut/releases/download/v{{ .NUT_VERSION }}/nut-{{ .NUT_VERSION }}.tar.gz

diff --git a/storage/drbd/pkg.yaml b/storage/drbd/pkg.yaml
@@ -5,7 +5,7 @@ dependencies:
  - stage: base
 # The pkgs version for a particular release of Talos as defined in
 # https://github.com/siderolabs/talos/blob/<talos version>/pkg/machinery/gendata/data/pkgs
- - image: "{{ .PKGS_PREFIX }}/drbd-pkg:{{ .BUILD_ARG_PKGS_VERSION }}"
+ - image: "{{ .PKGS_PREFIX }}/drbd-pkg:{{ .BUILD_ARG_PKGS }}"
 steps:
   - prepare:
       - |

diff --git a/storage/iscsi-tools/open-iscsi/pkg.yaml b/storage/iscsi-tools/open-iscsi/pkg.yaml
@@ -3,9 +3,9 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
-  - image: "{{ .PKGS_PREFIX }}/kmod:{{ .BUILD_ARG_PKGS_VERSION }}"
-  - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS_VERSION }}"
-  - image: "{{ .PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS_VERSION }}"
+  - image: "{{ .PKGS_PREFIX }}/kmod:{{ .BUILD_ARG_PKGS }}"
+  - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}"
+  - image: "{{ .PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}"
   - stage: open-isns
     from: /rootfs
 steps:

diff --git a/storage/iscsi-tools/open-isns/pkg.yaml b/storage/iscsi-tools/open-isns/pkg.yaml
@@ -3,7 +3,7 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
-  - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS_VERSION }}"
+  - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}"
 steps:
   - sources:
       - url: https://github.com/open-iscsi/open-isns/archive/refs/tags/v{{ .OPEN_ISNS_VERSION }}.tar.gz