From 46f08e6e112e1661894434f2518c5fcd99b27289 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrey.smirnov@siderolabs.com>
Date: Wed, 15 Jan 2025 16:53:04 +0400
Subject: [PATCH] chore: rerkres to fix reproducibility

Adjusts local output/multi-platform.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
---
 .github/renovate.json | 12 ++++++++++++
 Makefile              | 13 +------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 05c381c..dfa304c 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -43,6 +43,18 @@
                 "digest"
             ]
         },
+        {
+            "enabled": false,
+            "matchFileNames": [
+                "Dockerfile"
+            ]
+        },
+        {
+            "enabled": false,
+            "matchFileNames": [
+                ".github/workflows/*.yaml"
+            ]
+        },
         {
             "versioning": "regex:^(?<major>\\d+)_(?<minor>\\d+)_?(?<patch>\\d+)?$",
             "matchPackageNames": [
diff --git a/Makefile b/Makefile
index de9b5c3..646f295 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-12-17T04:44:02Z by kres 318187b.
+# Generated on 2025-01-15T12:28:45Z by kres 3b3f992.
 
 # common variables
 
@@ -36,13 +36,11 @@ PLATFORM ?= linux/amd64,linux/arm64
 PROGRESS ?= auto
 PUSH ?= false
 CI_ARGS ?=
-BUILDKIT_MULTI_PLATFORM ?= 1
 COMMON_ARGS = --file=Pkgfile
 COMMON_ARGS += --provenance=false
 COMMON_ARGS += --progress=$(PROGRESS)
 COMMON_ARGS += --platform=$(PLATFORM)
 COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
-COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=$(BUILDKIT_MULTI_PLATFORM)
 
 # targets defines all the available targets
 
@@ -112,15 +110,6 @@ target-%:  ## Builds the specified target defined in the Pkgfile. The build resu
 
 local-%:  ## Builds the specified target defined in the Pkgfile using the local output type. The build result will be output to the specified local destination.
 	@$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)"
-	@PLATFORM=$(PLATFORM) DEST=$(DEST) bash -c '\
-	  for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \
-	    echo $$platform; \
-	    directory="$${platform//\//_}"; \
-	    if [[ -d "$$DEST/$$directory" ]]; then \
-	      mv -f "$$DEST/$$directory/"* $$DEST; \
-	      rmdir "$$DEST/$$directory/"; \
-	    fi; \
-	  done'
 
 docker-%:  ## Builds the specified target defined in the Pkgfile using the docker output type. The build result will be loaded into Docker.
 	@$(MAKE) target-$* TARGET_ARGS="$(TARGET_ARGS)"