products/SLFO
SHA256
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update _config for Docker based builds

Browse Source 
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.

Signed-off-by: David Cassany <dcassany@suse.com>
This commit is contained in:
David Cassany 2024-10-08 16:16:20 +02:00
parent 0ed193c3d1
commit a3aaf11509
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_config
View File

@ -1,4 +1,3 @@
BuildFlags: setvcs BuildFlags: setvcs
BuildFlags: slsaversion:v1 BuildFlags: slsaversion:v1
@ -323,18 +322,18 @@ Macros:
%if "%_project" == "SUSE:SLFO:Main:Build" || "%_project" == "SUSE:ALP:Products:Basalt:1.0" %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: 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 Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci
%else %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" %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: 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 Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
%else %else
# That ignore seems not to make sense - we only inject -strict based on specific projects already # That ignore seems not to make sense - we only inject -strict based on specific projects already
Ignore: container-build-checks-strict Ignore: container-build-checks-strict
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE 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 Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE skopeo umoci
%endif %endif
%endif %endif