From e5faea6d8f5584610638bcfc692488f174720e11cee9474ce4bba9d2fab9749d Mon Sep 17 00:00:00 2001 From: Max Lin Date: Mon, 13 Oct 2025 16:18:59 +0800 Subject: [PATCH] _config: make sure the particular build configuration being available in this project's namespace --- _config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_config b/_config index 91d4d78..d2d59a8 100644 --- a/_config +++ b/_config @@ -190,7 +190,7 @@ Macros: # BuildFlags: excludebuild:gnu-compilers-hpc:gnu11-hpc # BuildFlags: excludebuild:gnu-compilers-hpc:gnu12-hpc -%if "%_project" == "openSUSE:Leap:16.0" +%if 0%{?_is_in_project} Macros: %vendor openSUSE %distribution openSUSE Leap 16.0 @@ -205,7 +205,7 @@ Macros: :Macros %endif -%if "%_project" == "openSUSE:Leap:16.0" +%if 0%{?_is_in_project} 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:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci @@ -791,7 +791,7 @@ Support: post-build-checks Support: rpmlint-mini # In the actual Tumbleweed repos, we want to be stricter with rpmlint -%if "%_project" == "openSUSE:Leap:16.0" +%if 0%{?_is_this_project} Support: rpmlint-strict %endif @@ -996,7 +996,7 @@ Prefer: -urw-base35-fonts Prefer: -gnome-session-xsession # unresolvable: have choice for libcontainers-policy >= 20230214 needed by libcontainers-common: libcontainers-default-policy libcontainers-openSUSE-policy -%if "%_project" == "openSUSE:Leap:16.0" +%if 0%{?_is_in_project} Prefer: libcontainers-openSUSE-policy %else Prefer: libcontainers-default-policy @@ -2190,7 +2190,7 @@ Prefer: -go1.18-openssl # Leap specific package list, the same list with excludebuild must add to Backports project # Most of package should be built in Backports -%if "%_project" == "openSUSE:Leap:16.0" +%if 0%{?_is_in_project} # excluding the failed/unresolvable package %ifarch i586 # unresolvable @@ -2330,7 +2330,7 @@ BuildFlags: onlybuild:memtest86+ BuildFlags: onlybuild:rage %endif %endif -%if "%_project" == "openSUSE:Leap:16.0" || "%{sub %_project 1 30}" == "openSUSE:Leap:16.0:Staging:adi" || "%{sub %_project 1 24}" == "openSUSE:Leap:16.0:Rings" +%if 0%{?_is_in_project} BuildFlags: excludebuild:translate-toolkit:test BuildFlags: excludebuild:000release-packages:Leap-x86-64-v3-release # build gpgme:qt for the qt5 support -- 2.51.1