Merge pull request '_config: Rename ALP to SLFO.' (#2) from gleidi/SLFO_main:alp-slfo into main
Reviewed-on: https://src.suse.de/products/SLFO_main/pulls/2 Reviewed-by: Marco Strigl <mstrigl@gitea_noreply@suse.de>
This commit is contained in:
commit
a65a2a1c44
28
_config
28
_config
@ -75,14 +75,14 @@ Macros:
|
||||
:Macros
|
||||
%endif
|
||||
|
||||
# SUSE ALP specific change
|
||||
%if "%_project" == "SUSE:ALP:Source:Standard:Core:1.0:Build" || "%{sub %_project 1 36}" == "SUSE:ALP:Source:Standard:1.0:Staging"
|
||||
# SUSE SLFO specific change
|
||||
%if "%_project" == "SUSE:SLFO:Main:Build" || "%{sub %_project 1 36}" == "SUSE:SLFO:Main:Staging"
|
||||
|
||||
# no mono on ALP
|
||||
# no mono on SLFO
|
||||
BuildFlags: excludebuild:gettext-runtime:gettext-csharp
|
||||
BuildFlags: excludebuild:meson:test
|
||||
|
||||
# no gtk2/fltk on ALP
|
||||
# no gtk2/fltk on SLFO
|
||||
BuildFlags: excludebuild:libappindicator:gtk2
|
||||
BuildFlags: excludebuild:pinentry:gui
|
||||
|
||||
@ -104,10 +104,10 @@ BuildFlags: excludebuild:python-isort:test
|
||||
BuildFlags: excludebuild:virt-manager:test
|
||||
BuildFlags: excludebuild:python-pandas:test-py311
|
||||
|
||||
# no 32bit on ALP
|
||||
# no 32bit on SLFO
|
||||
BuildFlags: excludebuild:rpmlint:test
|
||||
|
||||
# disable Arm platforms not supported on ALP
|
||||
# disable Arm platforms not supported on SLFO
|
||||
BuildFlags: excludebuild:arm-trusted-firmware:a3700
|
||||
BuildFlags: excludebuild:arm-trusted-firmware:fvp
|
||||
BuildFlags: excludebuild:arm-trusted-firmware:hikey
|
||||
@ -269,10 +269,10 @@ Macros:
|
||||
:Macros
|
||||
%endif
|
||||
|
||||
# On ALP there's no need for sanlock-devel and its dependencies
|
||||
# On SLFO there's no need for sanlock-devel and its dependencies
|
||||
BuildFlags: excludebuild:lvm2:lockd
|
||||
|
||||
# ALP only ships gcc13, not older versions
|
||||
# SLFO only ships gcc13, not older versions
|
||||
BuildFlags: excludebuild:gnu-compilers-hpc:gnu8-hpc
|
||||
BuildFlags: excludebuild:gnu-compilers-hpc:gnu9-hpc
|
||||
BuildFlags: excludebuild:gnu-compilers-hpc:gnu10-hpc
|
||||
@ -312,7 +312,7 @@ Macros:
|
||||
:Macros
|
||||
%endif
|
||||
|
||||
%if "%_project" == "SUSE:ALP:Source:Standard:Core:1.0: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: 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
|
||||
@ -919,7 +919,7 @@ Support: rpmlint-strict
|
||||
Prefer: -coreutils-single
|
||||
|
||||
### Branding related preferences
|
||||
### Need to be different openSUSE vs. SLE/ALP
|
||||
### Need to be different openSUSE vs. SLE/SLFO
|
||||
%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree"
|
||||
Prefer: systemd-default-settings-branding-openSUSE
|
||||
Prefer: distribution-logos-openSUSE-Tumbleweed
|
||||
@ -940,7 +940,7 @@ Prefer: libxfce4ui:libxfce4ui-branding-upstream
|
||||
Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream
|
||||
Prefer: mate-desktop-gschemas:mate-desktop-gschemas-branding-upstream
|
||||
Prefer: NetworkManager:-NetworkManager-branding-upstream
|
||||
# ALP specific
|
||||
# SLFO specific
|
||||
Prefer: -NetworkManager-branding-upstream
|
||||
Prefer: PackageKit:PackageKit-branding-upstream
|
||||
Prefer: sddm:sddm-branding-upstream
|
||||
@ -960,7 +960,7 @@ Prefer: hwdata
|
||||
Prefer: xfce4-panel-branding-openSUSE:xfce4-whiskermenu-plugin
|
||||
Prefer: patterns-xfce-xfce:mate-calc
|
||||
%else
|
||||
# SLE / ALP code base
|
||||
# SLE / SLFO code base
|
||||
# FIXME: This fixes the impact into raw images, the rest needs to be reviewed
|
||||
Prefer: systemd-default-settings-branding-openSUSE
|
||||
Prefer: distribution-logos-openSUSE-Tumbleweed
|
||||
@ -981,7 +981,7 @@ Prefer: libxfce4ui:libxfce4ui-branding-upstream
|
||||
Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream
|
||||
Prefer: mate-desktop-gschemas:mate-desktop-gschemas-branding-upstream
|
||||
Prefer: NetworkManager:-NetworkManager-branding-upstream
|
||||
# ALP specific
|
||||
# SLFO specific
|
||||
Prefer: -NetworkManager-branding-upstream
|
||||
Prefer: PackageKit:PackageKit-branding-upstream
|
||||
Prefer: sddm:sddm-branding-upstream
|
||||
@ -3934,7 +3934,7 @@ Macros:
|
||||
%_without_have_pyarrow 1
|
||||
:Macros
|
||||
|
||||
# AppArmor is not planned to be part of ALP code base
|
||||
# AppArmor is not planned to be part of SLFO code base
|
||||
%define _without_apparmor 1
|
||||
Macros:
|
||||
%_without_apparmor 1
|
||||
|
Loading…
Reference in New Issue
Block a user