enable container wrapping and additional adaptations for Basalt

This commit is contained in:
Frederic Crozat 2023-09-27 14:45:37 +02:00
parent 27c72441c6
commit abccb4023d

20
_config
View File

@ -44,6 +44,7 @@ RepoType: rpm-md:sha512:filelists-ext
Patterntype: none
Prefer: openSUSE-release-ftp
Support: release-compare
Support: containment-rpm
# BuildFlags: obsgendiff
%endif
@ -59,6 +60,13 @@ RepoType: rpm-md:sha512:filelists-ext
%ifarch x86_64
BuildFlags: dockerarg:TARGETARCH=amd64
%endif
Required: containment-rpm
PreInstall: release-compare
%endif
%if "%_repository" == "helmcharts"
Type: helm
PreInstall: release-compare perl-YAML-LibYAML
%endif
%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:zSystems"
@ -242,6 +250,11 @@ Macros:
:Macros
%endif
%if "%_project" == "SUSE:ALP:Source:Standard:Core:1.0: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 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 docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
@ -249,9 +262,10 @@ Substitute: system-packages:podman podman buildah createrepo_c release-compare c
%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-openSUSE
Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE skopeo umoci
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE skopeo umoci
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE
Substitute: system-packages:docker kmod kernel-default 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
%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:zSystems" || "%_project" == "openSUSE:Factory:LegacyX86"