diff --git a/_attribute b/_attribute index cfde754..5d84c53 100644 --- a/_attribute +++ b/_attribute @@ -99,7 +99,7 @@ boo#1162853: '20200226' boo#1163655: '20200218' boo#1163766: '20200226' - boo#1164313: '20200225' + boo#1164313: '20200226' bsc#1114673: '20191202' bsc#1120957: '20190508' bsc#1126782: '20191016' @@ -236,7 +236,9 @@ poo#63457: '20200213' poo#63775: '20200222' poo#63778: '20200225' + poo#63880: '20200226' poo#63892: '20200226' + poo#63910: '20200226' @@ -260,7 +262,7 @@ pkglistgen-scopes = target rings # subpackages of ring packages with unacceptable requires (don't abuse) repo_checker-binary-whitelist-ring = patterns-media-rest_dvd patterns-media-rest_cd_x11 patterns-devel-base-devel_web monitoring-plugins-metadata codec2-examples libreoffice-l10n-fi java-1_8_0-openjdk-accessibility -repo_checker-allowed-in-cycles = acl,attr,audit,autoconf,automake,bc,binutils,bison,bzip2,cpio,cracklib,dejagnu,dwz,e2fsprogs,ed,elfutils,expat,expect,fdupes,file,findutils,flex,gawk,gcc,gcc9,gcc10,gdbm,gettext-runtime-mini,glibc,glibc:i686,gmp,gpm,gzip,help2man,isl,keyutils,krb5-mini,libcap,libcap-ng,libdb-4_8,libeconf,libffi,libgcrypt,libgpg-error,libnsl,libnss_usrfiles,libseccomp,libselinux,libsemanage,libsepol,libtirpc,libtool,libustr,libverto,libxcrypt,libzio,linux-glibc-devel,lua-macros,lua53,m4,make,mpc,mpfr,ncurses,netcfg,openssl,openssl-1_1,pam,patch,pcre,perl,perl-Text-Unidecode,perl-gettext,permissions,pkg-config,pkgconf,popt,python-rpm-macros,python3-base,readline,rpm,screen,shadow,system-user-root,system-users,systemd-rpm-macros,systemtap-headers,sysuser-tools,tcl,tcpd,texinfo,timezone,update-alternatives,utempter,util-linux,which,xz,zlib,zstd,cmake,curl,libssh,c-ares,nghttp2 +repo_checker-allowed-in-cycles = acl,attr,audit,autoconf,automake,bc,binutils,bison,bzip2,cpio,cracklib,dejagnu,dwz,e2fsprogs,ed,elfutils,expat,expect,fdupes,file,findutils,flex,gawk,gcc,gcc9,gcc10,gdbm,gettext-runtime-mini,glibc,glibc:i686,gmp,gpm,gzip,help2man,isl,keyutils,krb5-mini,libcap,libcap-ng,libdb-4_8,libeconf,libffi,libgcrypt,libgpg-error,libnsl,libnss_usrfiles,libseccomp,libselinux,libsemanage,libsepol,libtirpc,libtool,libustr,libverto,libxcrypt,libzio,linux-glibc-devel,lua-macros,lua53,m4,make,mpc,mpfr,ncurses,netcfg,openssl,openssl-1_1,pam,patch,pcre,perl,perl-Text-Unidecode,perl-gettext,permissions,pkg-config,pkgconf,popt,python-rpm-macros,python3-base,readline,rpm,screen,shadow,system-user-root,system-users,systemd-rpm-macros,systemtap-headers,sysuser-tools,tcl,tcpd,texinfo,timezone,update-alternatives,utempter,util-linux,which,xz,zlib,zstd staging-required-checks-adi = installcheck repo_checker-project-skip = True @@ -279,7 +281,7 @@ bad-rpmlint-entries = suse-dbus-unauthorized-service suse-pam-unauthorized-modul s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20200226 + 20200227 arch: x86_64 @@ -440,7 +442,7 @@ test_subproject: ToTest set_snapshot_number: True - failed: '20200226' + failed: '' published: '20200224' publishing: '20200224' testing: '20200226' diff --git a/_config b/_config index b065859..3fe1450 100644 --- a/_config +++ b/_config @@ -1,10 +1,6 @@ # Workaround https://bugzilla.opensuse.org/show_bug.cgi?id=1125775#c9 - until firewalld is fixed. Ignore: firewall-macros:firewalld -# Workaround packages requiring curl-mini -#Substitute: curl-mini curl -#Substitute: libcurl4-mini libcurl - # Help python-subinit to win until python-python-subunit is gone Prefer: python2-subunit python3-subunit @@ -80,12 +76,12 @@ Substitute: system-packages:kiwi-product product-builder # allow builds using docker tool Substitute: system-packages:docker kmod kernel-default docker createrepo_c zypper -Substitute: build-packages:docker python3-kiwi !systemd-mini !udev-mini !krb5-mini !libsystemd0-mini !libudev-mini1 !krb5-mini !gettext-tools-mini !curl-mini !systemd-mini-sysvinit +Substitute: build-packages:docker python3-kiwi !systemd-mini !udev-mini !krb5-mini !libsystemd0-mini !libudev-mini1 !krb5-mini !gettext-tools-mini !cmake-mini !systemd-mini-sysvinit # Podman based image building Substitute: system-packages:podman kmod kernel-default podman buildah createrepo_c zypper -Substitute: build-packages:kiwi python3-kiwi !systemd-mini !udev-mini !krb5-mini !libsystemd0-mini !libudev-mini1 !krb5-mini !gettext-tools-mini !curl-mini !systemd-mini-sysvinit !dummy-release !libunbound-devel-mini +Substitute: build-packages:kiwi python3-kiwi !systemd-mini !udev-mini !krb5-mini !libsystemd0-mini !libudev-mini1 !krb5-mini !gettext-tools-mini !cmake-mini !systemd-mini-sysvinit !dummy-release !libunbound-devel-mini # To build ISO images Substitute: build-packages:iso !systemd-mini !udev-mini !krb5-mini !libsystemd0-mini !systemd-mini-sysvinit @@ -307,15 +303,12 @@ Prefer: -harfbuzz-bootstrap -harfbuzz-bootstrap-devel # break dependency of the -mini packages: they are valid for OBS, but not for end-user-installation Ignore: cmake-mini:this-is-only-for-build-envs -Ignore: curl-mini:this-is-only-for-build-envs Ignore: dummy-release:this-is-only-for-build-envs Ignore: erlang-rebar-obs:this-is-only-for-build-envs Ignore: ghc-bootstrap-helpers:this-is-only-for-build-envs Ignore: ghc-bootstrap:this-is-only-for-build-envs Ignore: harfbuzz-bootstrap:this-is-only-for-build-envs Ignore: jdk-bootstrap:this-is-only-for-build-envs -Ignore: libcurl-mini-devel:this-is-only-for-build-envs -Ignore: libcurl4-mini:this-is-only-for-build-envs Ignore: libsystemd0-mini:this-is-only-for-build-envs Ignore: libudev-mini1:this-is-only-for-build-envs Ignore: libunbound-devel-mini:this-is-only-for-build-envs @@ -364,11 +357,6 @@ Conflict: udev:libudev-mini1 Conflict: systemd:libsystemd0-mini Conflict: systemd-mini-devel:systemd -# curl: there is a -mini package to bootstrap and a full; some programs decide on what they want to build in based on what curl can do, so let's prefer full curl -Prefer: curl libcurl-devel libcurl4 -Prefer: cmake:libcurl4-mini -#Prefer: -curl-mini -libcurl-mini-devel -libcurl4-mini - # Cmake exists as a -mini flavor, which is not linked against curl. # That substitute is crap - it actually replaces Requires: cmake with Requires: cmake-mini in spec files!!! # Substitute: cmake cmake-mini @@ -377,16 +365,6 @@ Prefer: cmake-mini # Samba brings python2 and python3 bindings, with the py3-bindings not 100% complete yet. So we favor py2 Prefer: samba-libs-python -# Remain so many unresolvable packages, we need some magic here! -# Prefer: libcurl-devel:libcurl4 -# Substitute: pkgconfig(libcurl) libcurl4 libcurl-devel -# Substitute: curl-devel libcurl4 libcurl-devel -# Conflict: ghc-curl-devel:libcurl4-mini -# Conflict: netcdf-devel:libcurl4-mini -# Conflict: libkolabxml-devel:libcurl4-mini -# Conflict: kdump:libcurl4-mini -# Conflict: yast2-transfer:libcurl4-mini - Prefer: -suse-build-key # Set postfix as the 'default' smtp_daemon (virtual symbol provided by all MTAs) Prefer: postfix diff --git a/_staging_workflow b/_staging_workflow index 1ba82d4..a9cb543 100644 --- a/_staging_workflow +++ b/_staging_workflow @@ -34,7 +34,6 @@ - @@ -42,41 +41,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - +