From c0244194975bae1ca3b2a9efc5e148c4e0c7f985baad8b8acf49121e19f7c4fc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Apr 2019 18:52:08 +0000 Subject: [PATCH] Accepting request 692231 from home:RBrownSUSE:microos Groups.yml refreshed, all patterns defined, with correct names OBS-URL: https://build.opensuse.org/request/show/692231 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=63 --- groups.yml | 29 ++++++-- ...pec.in => openSUSE-MicroOS-release.spec.in | 17 ++--- ....product.in => openSUSE-MicroOS.product.in | 68 +++++++++++-------- 3 files changed, 70 insertions(+), 44 deletions(-) rename openSUSE-Tumbleweed-Kubic-release.spec.in => openSUSE-MicroOS-release.spec.in (88%) rename openSUSE-Tumbleweed-Kubic.product.in => openSUSE-MicroOS.product.in (56%) diff --git a/groups.yml b/groups.yml index 491af95..8dc7597 100644 --- a/groups.yml +++ b/groups.yml @@ -12,7 +12,12 @@ OUTPUT: - opensuse_kubic: recommends: false includes: + - opensuse_microos - opensuse_kubic + - opensuse_microos: + recommends: false + includes: + - opensuse_microos dvd: - kernel-default @@ -341,19 +346,29 @@ dvd: - inkscape - autoyast2 -opensuse_kubic: +opensuse_microos: - dummy-release: [locked] # we need a global flag, not there yet - kernel-vanilla-base: [locked] - kernel-kvmsmall-base: [locked] - kernel-vanilla: [locked] - kernel-kvmsmall: [locked] - - openSUSE-Tumbleweed-Kubic-release + - openSUSE-MicroOS-release - kernel-default - - patterns-caasp-MicroOS: [aarch64,x86_64] - - patterns-caasp-kubeadm: [aarch64,x86_64] - - patterns-caasp-onlyDVD: [aarch64,x86_64] - - patterns-caasp-alt-onlyDVD: [aarch64,x86_64] + - 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-onlyDVD: [aarch64,x86_64] + - patterns-microos-alt_onlyDVD: [aarch64,x86_64] - podman-cni-config: [aarch64,x86_64] - - docker-kubic-kubeadm-criconfig: [aarch64,x86_64] - kernel-default-base: [aarch64,x86_64] + +opensuse_kubic: + - patterns-containers-kubeadm: [aarch64,x86_64] + - patterns-containers-container_runtime_kubernetes: [aarch64,x86_64] + - patterns-containers-container_runtime: [aarch64,x86_64] diff --git a/openSUSE-Tumbleweed-Kubic-release.spec.in b/openSUSE-MicroOS-release.spec.in similarity index 88% rename from openSUSE-Tumbleweed-Kubic-release.spec.in rename to openSUSE-MicroOS-release.spec.in index 8d31d32..8295f1e 100644 --- a/openSUSE-Tumbleweed-Kubic-release.spec.in +++ b/openSUSE-MicroOS-release.spec.in @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Tumbleweed-Kubic-release.spec +# spec file for package openSUSE-MicroOS-release.spec # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # -Name: openSUSE-Tumbleweed-Kubic-release +Name: openSUSE-MicroOS-release Version: ___VERSION___ Release: 0 Summary: ___SUMMARY___ ___BETA_VERSION___ @@ -32,8 +32,9 @@ Recommends: branding Conflicts: distribution-release Conflicts: kernel < 4.4 Provides: distribution-release -# Needed to not break installation-images in short turn; this needs to fixed there of course -Provides: openSUSE-Kubic-release +# MicroOS-release replaces Tumbleweed-Kubic-release +Provides: openSUSE-Tumbleweed-Kubic-release +Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324 # this package should only be available for the "basearchs" of a product ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 ___PRODUCT_PROVIDES___ @@ -69,14 +70,14 @@ VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'` # note: VERSION is an optional field and has no meaning other than informative on a rolling distro # We do thus not add it to the os-release file cat > %{buildroot}%{_libexecdir}/os-release < openSUSE - openSUSE-Tumbleweed-Kubic - openSUSE-Tumbleweed-Kubic-release + openSUSE-MicroOS + openSUSE-MicroOS-release 0 - openSUSE-Tumbleweed-Kubic + openSUSE-MicroOS - openSUSE Tumbleweed Kubic - openSUSE Tumbleweed Kubic - openSUSE Tumbleweed Kubic combines the benefits of a rolling OS with a container orchestration platform. It is a modern Linux Operating System, designed for containers and optimized for large, clustered deployments. It inherits the - benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution. + openSUSE MicroOS + openSUSE MicroOS + openSUSE MicroOS combines the benefits of a rolling OS with a read-only root filesystem with transactional updates. It is a modern Linux Operating System, designed for single-service installations, such as container hosts. It is optimized for large, clustered deployments. + It inherits the benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution. @@ -27,7 +27,7 @@ - Kubic + MicroOS true @@ -53,7 +53,34 @@ + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + +