From ef64186886750e33eb8cfb95080373ecbb365910ba2f696a5575f67082f223c7 Mon Sep 17 00:00:00 2001 From: David Cassany Date: Tue, 8 Oct 2024 16:19:49 +0200 Subject: [PATCH] Update _config for Docker based builds Docker does not require kernel-default anymore so the dummy-release package is not required anymore. Moreover, I don't think there is `dummy-release` in SLFO, there is an ALP-dummy-release instead. In any case no dummy-release should be required anyway. --- _config | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/_config b/_config index 2aac64d..866f30b 100644 --- a/_config +++ b/_config @@ -1,4 +1,3 @@ - BuildFlags: setvcs BuildFlags: slsaversion:v1 @@ -323,18 +322,18 @@ Macros: %if "%_project" == "SUSE:SLFO:Main:Build" || "%_project" == "SUSE:ALP:Products:Basalt:1.0" Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE container-build-checks-strict -Substitute: system-packages:docker kmod kernel-default dummy-release docker createrepo_c container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci +Substitute: system-packages:docker kmod docker createrepo_c container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci %else %if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:LegacyX86" Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict -Substitute: system-packages:docker kmod kernel-default dummy-release docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci +Substitute: system-packages:docker kmod docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci %else # That ignore seems not to make sense - we only inject -strict based on specific projects already Ignore: container-build-checks-strict Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE -Substitute: system-packages:docker kmod kernel-default dummy-release docker createrepo_c container-build-checks-vendor-SUSE skopeo umoci +Substitute: system-packages:docker kmod docker createrepo_c container-build-checks-vendor-SUSE skopeo umoci Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE skopeo umoci %endif %endif