diff --git a/_config b/_config index b391025..1f31906 100644 --- a/_config +++ b/_config @@ -105,6 +105,8 @@ BuildFlags: excludebuild:python-isort:test BuildFlags: excludebuild:virt-manager:test BuildFlags: excludebuild:python-pandas:test-py311 +# temporary disable to allow staging to work properly, will remove once fixed sr are done +BuildFlags: excludebuild:python-redis # no 32bit on ALP BuildFlags: excludebuild:rpmlint:test @@ -1834,12 +1836,34 @@ Optflags: * -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-st %define skelcd_compat 0 %define _without_aom 1 %define _without_avif 1 +%define disable_32bit 1 + +%ifarch s390x +%define tuneflag zEC12 +%define archflag zEC12 + +Macros: +%tuneflag zEC12 +%archflag zEC12 +:Macros +%endif + +Substitute: glibc-devel-32bit +Substitute: glibc-devel-static-32bit +Substitute: gcc-32bit +Substitute: gcc5-32bit +Substitute: gcc6-32bit +Substitute: gcc-ada-32bit +Substitute: gcc5-c++-32bit +Substitute: gcc6-c++-32bit +Substitute: gcc-c++-32bit Macros: %suse_version 1600 %workbench_version 0100 %is_opensuse 0 %skelcd_compat 0 +%disable_32bit 1 %_without_aom 1 %_without_avif 1 %build_ldflags %{?_lto_cflags} @@ -1923,34 +1947,8 @@ Macros: # Support: !rpmlint-Factory # Support: !rpmlint-Factory-strict - - -# copy-paste from openSUSE:Factory:zSystems -%ifarch s390x -%define disable_32bit 1 -%define tuneflag zEC12 -%define archflag zEC12 - -Macros: -%disable_32bit 1 -%tuneflag zEC12 -%archflag zEC12 -:Macros - -Substitute: glibc-devel-32bit -Substitute: glibc-devel-static-32bit -Substitute: gcc-32bit -Substitute: gcc5-32bit -Substitute: gcc6-32bit -Substitute: gcc-ada-32bit -Substitute: gcc5-c++-32bit -Substitute: gcc6-c++-32bit -Substitute: gcc-c++-32bit -%endif - Substitute: mail -%if 1 %if "%_project" == "SUSE:ALP:Workbench:1.0" %if "%_repository" == "standard" %ifarch riscv64 @@ -1976,6 +1974,5 @@ ExportFilter: ^(kernel-obs-build|qemu-linux-user).*\.riscv64\.rpm$ ExportFilter: ^qemu-linux-user-riscv.*\.riscv64\.rpm$ . %endif # %qemu_user_space_build -%endif # SUSE:ALP -%endif # 1 +%endif # SUSE:ALP:Workbench:1.0