From 58313a05faf4bd6e03295cc0aa92730c6f988946 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: Mar 31 2020 15:34:52 +0000 Subject: Update 000package-groups to rev 109 via SR 789127 https://build.opensuse.org/request/show/789127 by user binary_sequence + dimstar_suse - Add s390x for MicroOS and containers patterns --- diff --git a/.files b/.files index 853a75c..d44cc38 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index b7e24af..a1e6712 100644 --- a/.rev +++ b/.rev @@ -766,4 +766,20 @@ remove obsolete _opt patterns Prevent MicroOS Desktops from being added to Kubic media 779084 + + b99113d3c9686800ec645bd484bddc6f + unknown + + dimstar_suse + Add weakremover provides. Not tested yet, but has to be submitted for testing. + 789726 + + + 526e7755c3ee8d778e525a30a0ccdcd6 + unknown + + dimstar_suse + - Add s390x for MicroOS and containers patterns + 789127 + diff --git a/groups.yml b/groups.yml index 2e9caf0..11f4cd0 100644 --- a/groups.yml +++ b/groups.yml @@ -366,21 +366,21 @@ opensuse_microos: - kernel-debug: [locked] - openSUSE-MicroOS-release - kernel-default - - patterns-microos-base: [aarch64,x86_64] - - patterns-microos-defaults: [aarch64,x86_64] - - patterns-microos-hardware: [aarch64,x86_64] - - patterns-microos-apparmor: [aarch64,x86_64] - - patterns-microos-selinux: [aarch64,x86_64] - - patterns-microos-sssd_ldap: [aarch64,x86_64] - - patterns-microos-ima_evm: [aarch64,x86_64] - - patterns-microos-cloud: [aarch64,x86_64] + - patterns-microos-base: [aarch64,s390x,x86_64] + - patterns-microos-defaults: [aarch64,s390x,x86_64] + - patterns-microos-hardware: [aarch64,s390x,x86_64] + - patterns-microos-apparmor: [aarch64,s390x,x86_64] + - patterns-microos-selinux: [aarch64,s390x,x86_64] + - patterns-microos-sssd_ldap: [aarch64,s390x,x86_64] + - patterns-microos-ima_evm: [aarch64,s390x,x86_64] + - patterns-microos-cloud: [aarch64,s390x,x86_64] - patterns-microos-desktop-kde: [aarch64,x86_64] - patterns-microos-desktop-gnome: [aarch64,x86_64] - - patterns-microos-onlyDVD: [aarch64,x86_64] - - patterns-microos-alt_onlyDVD: [aarch64,x86_64] - - patterns-containers-container_runtime: [aarch64,x86_64] - - podman-cni-config: [aarch64,x86_64] - - kernel-default-base: [aarch64,x86_64] + - patterns-microos-onlyDVD: [aarch64,s390x,x86_64] + - patterns-microos-alt_onlyDVD: [aarch64,s390x,x86_64] + - patterns-containers-container_runtime: [aarch64,s390x,x86_64] + - podman-cni-config: [aarch64,s390x,x86_64] + - kernel-default-base: [aarch64,s390x,x86_64] - grub2-x86_64-efi: [x86_64] - grub2-i386-pc: [x86_64] - grub2-arm64-efi: [aarch64] @@ -388,13 +388,13 @@ opensuse_microos: opensuse_kubic: - patterns-microos-desktop-kde: [locked] - patterns-microos-desktop-gnome: [locked] - - patterns-containers-kubeadm: [aarch64,x86_64] - - patterns-containers-container_runtime_kubernetes: [aarch64,x86_64] - - patterns-containers-container_runtime: [aarch64,x86_64] - - patterns-containers-kubic_worker: [aarch64,x86_64] - - patterns-containers-kubic_admin: [aarch64,x86_64] - - patterns-containers-kubernetes_utilities: [aarch64,x86_64] - - patterns-containers-kubic_loadbalancer: [aarch64,x86_64] + - patterns-containers-kubeadm: [aarch64,s390x,x86_64] + - patterns-containers-container_runtime_kubernetes: [aarch64,s390x,x86_64] + - patterns-containers-container_runtime: [aarch64,s390x,x86_64] + - patterns-containers-kubic_worker: [aarch64,s390x,x86_64] + - patterns-containers-kubic_admin: [aarch64,s390x,x86_64] + - patterns-containers-kubernetes_utilities: [aarch64,s390x,x86_64] + - patterns-containers-kubic_loadbalancer: [aarch64,s390x,x86_64] - grub2-x86_64-efi: [x86_64] - grub2-i386-pc: [x86_64] - grub2-arm64-efi: [aarch64] diff --git a/openSUSE-MicroOS-release.spec.in b/openSUSE-MicroOS-release.spec.in index 48a63a5..27e87b5 100644 --- a/openSUSE-MicroOS-release.spec.in +++ b/openSUSE-MicroOS-release.spec.in @@ -22,6 +22,7 @@ Release: 0 Summary: ___SUMMARY___ ___BETA_VERSION___ License: GPL-2.0-or-later Group: System/Fhs +Source100: weakremovers.inc BuildRequires: skelcd-openSUSE Requires: issue-generator # Make sure we are at SLES12 SP2 level @@ -41,6 +42,131 @@ Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324 Provides: system-installation() = openSUSE-MicroOS # this package should only be available for the "basearchs" of a product ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm +# bnc#826592 +Provides: weakremover(kernel-default) < 3.11 +Provides: weakremover(kernel-desktop) < 4.2 +Provides: weakremover(kernel-ec2) < 3.11 +Provides: weakremover(kernel-pae) < 3.11 +Provides: weakremover(kernel-vanilla) < 3.11 +Provides: weakremover(kernel-xen) < 3.11 +# migrated from MANUAL_OBSOLETES/packages +Provides: weakremover(boost-license1_56_0) +Provides: weakremover(boost-license1_59_0) +Provides: weakremover(gpg-pubkey-3d25d3d9-36e12d04) +Provides: weakremover(lib++dfb-1_7-6) +Provides: weakremover(libastro-qt5-1) +Provides: weakremover(libboost_atomic1_59_0) +Provides: weakremover(libboost_atomic1_60_0) +Provides: weakremover(libboost_atomic1_62_0) +Provides: weakremover(libboost_atomic1_63_0) +Provides: weakremover(libboost_chrono1_59_0) +Provides: weakremover(libboost_chrono1_60_0) +Provides: weakremover(libboost_chrono1_62_0) +Provides: weakremover(libboost_chrono1_63_0) +Provides: weakremover(libboost_container1_59_0) +Provides: weakremover(libboost_container1_60_0) +Provides: weakremover(libboost_container1_62_0) +Provides: weakremover(libboost_container1_63_0) +Provides: weakremover(libboost_context1_59_0) +Provides: weakremover(libboost_context1_60_0) +Provides: weakremover(libboost_context1_62_0) +Provides: weakremover(libboost_context1_63_0) +Provides: weakremover(libboost_coroutine1_59_0) +Provides: weakremover(libboost_coroutine1_60_0) +Provides: weakremover(libboost_coroutine1_62_0) +Provides: weakremover(libboost_coroutine1_63_0) +Provides: weakremover(libboost_date_time1_59_0) +Provides: weakremover(libboost_date_time1_60_0) +Provides: weakremover(libboost_date_time1_62_0) +Provides: weakremover(libboost_date_time1_63_0) +Provides: weakremover(libboost_filesystem1_59_0) +Provides: weakremover(libboost_filesystem1_60_0) +Provides: weakremover(libboost_filesystem1_62_0) +Provides: weakremover(libboost_filesystem1_63_0) +Provides: weakremover(libboost_graph1_59_0) +Provides: weakremover(libboost_graph1_60_0) +Provides: weakremover(libboost_graph1_62_0) +Provides: weakremover(libboost_graph1_63_0) +Provides: weakremover(libboost_iostreams1_59_0) +Provides: weakremover(libboost_locale1_59_0) +Provides: weakremover(libboost_log1_59_0) +Provides: weakremover(libboost_log1_60_0) +Provides: weakremover(libboost_log1_62_0) +Provides: weakremover(libboost_log1_63_0) +Provides: weakremover(libboost_math1_59_0) +Provides: weakremover(libboost_program_options1_59_0) +Provides: weakremover(libboost_python1_59_0) +Provides: weakremover(libboost_random1_59_0) +Provides: weakremover(libboost_regex1_59_0) +Provides: weakremover(libboost_regex1_60_0) +Provides: weakremover(libboost_regex1_62_0) +Provides: weakremover(libboost_regex1_63_0) +Provides: weakremover(libboost_serialization1_59_0) +Provides: weakremover(libboost_signals1_59_0) +Provides: weakremover(libboost_system1_56_0) +Provides: weakremover(libboost_system1_59_0) +Provides: weakremover(libboost_test1_59_0) +Provides: weakremover(libboost_thread1_56_0) +Provides: weakremover(libboost_thread1_59_0) +Provides: weakremover(libboost_timer1_59_0) +Provides: weakremover(libboost_wave1_59_0) +Provides: weakremover(libcamel-1_2-54) +Provides: weakremover(libdialog12) +Provides: weakremover(libdirectfb-1_7-6) +Provides: weakremover(libdns146) +Provides: weakremover(libdns160) +Provides: weakremover(libdns161) +Provides: weakremover(libgdict-1_0-9) +Provides: weakremover(libgit2-23) +Provides: weakremover(libgpaste4) +Provides: weakremover(libhdf5-11) +Provides: weakremover(libhdf5_hl11) +Provides: weakremover(libicu54_1) +Provides: weakremover(libicu54_1-ledata) +Provides: weakremover(libicu55_1) +Provides: weakremover(libicu55_1-ledata) +Provides: weakremover(libicu56_1) +Provides: weakremover(libicu56_1-ledata) +Provides: weakremover(libimobiledevice5) +Provides: weakremover(libisc142) +Provides: weakremover(libisc148) +Provides: weakremover(libisl13) +Provides: weakremover(libixion-0_10-0) +Provides: weakremover(liblmdb-0_9_16) +Provides: weakremover(libmicrohttpd11) +Provides: weakremover(libminiupnpc15) +Provides: weakremover(libnis1) +Provides: weakremover(libntfs-3g86) +Provides: weakremover(liborcus-0_10-0) +Provides: weakremover(libpoppler47) +Provides: weakremover(libpoppler48) +Provides: weakremover(libpoppler49) +Provides: weakremover(libpoppler50) +Provides: weakremover(libpoppler51) +Provides: weakremover(libpoppler52) +Provides: weakremover(libpoppler53) +Provides: weakremover(libpoppler54) +Provides: weakremover(libpoppler55) +Provides: weakremover(libpoppler56) +Provides: weakremover(libpoppler57) +Provides: weakremover(libpoppler58) +Provides: weakremover(libpoppler59) +Provides: weakremover(libpoppler61) +Provides: weakremover(libpoppler62) +Provides: weakremover(libpoppler63) +Provides: weakremover(libpoppler64) +Provides: weakremover(libpoppler65) +Provides: weakremover(libprocps4) +Provides: weakremover(libprocps5) +Provides: weakremover(libpsl0) +Provides: weakremover(libsgutils2-1_40-2) +Provides: weakremover(libsgutils2-1_41-2) +Provides: weakremover(libvpx2) +Provides: weakremover(libxtables11) +Provides: weakremover(libzip4) +Provides: weakremover(mt_st) +Provides: weakremover(openssl-debuginfo) +%include %{SOURCE100} ___PRODUCT_PROVIDES___ ___PRODUCT_DEPENDENCIES___