diff --git a/_multibuild b/_multibuild index 23b5c58..dd3b34b 100644 --- a/_multibuild +++ b/_multibuild @@ -2,7 +2,6 @@ openSUSE SLES CAASP - Kubic MicroOS SMO diff --git a/installation-images-17.53.tar.xz b/installation-images-17.53.tar.xz deleted file mode 100644 index 7050e02..0000000 --- a/installation-images-17.53.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc3b71f5afcc37a5c58301167e08bcfd0b5e66f4cb8c94a94244fcfcaa3609e7 -size 243804 diff --git a/installation-images-17.54.tar.xz b/installation-images-17.54.tar.xz new file mode 100644 index 0000000..81018aa --- /dev/null +++ b/installation-images-17.54.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3c2f177beeb21f55e7695c8d43206ea22b535c380b7b94293c3f8e9b6587a1f +size 243720 diff --git a/installation-images.changes b/installation-images.changes index 16159a9..93a4992 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Wed Jun 8 09:36:55 UTC 2022 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#597 +- Retire Kubic: there are no images built anymore +- 17.54 + -------------------------------------------------------------------- Wed Jun 8 08:57:50 UTC 2022 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 231e8d4..93d2ba7 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -90,15 +90,6 @@ ExclusiveArch: do_not_build %endif %endif -%if "%flavor" == "Kubic" -# don't build on Leap for now -%if 0%{?is_opensuse} && !0%{?sle_version} -%ifnarch %ix86 -%define theme Kubic -%endif -%endif -%endif - %if "%flavor" == "SMO" %if 0%{?is_smo} # build for both Leap and SLE @@ -180,24 +171,6 @@ BuildRequires: distribution-logos-openSUSE-Leap %endif %endif -%if "%theme" == "Kubic" -%define with_storage_ng 1 -%define with_ssl_hmac 0 -%define branding_skelcd Kubic -%define branding_systemd MicroOS -%define branding_plymouth openSUSE -%define branding_grub2 openSUSE -%define branding_gfxboot openSUSE -%define config_bootmenu_no_upgrade 1 -BuildRequires: MicroOS-release -BuildRequires: adobe-sourcesanspro-fonts -BuildRequires: distribution-logos-openSUSE-Kubic - -# Kubic is based on MicroOS but we don't want this to show -# note: keep this in sync with the Kubic settings in etc/config -%global product_name openSUSE-Kubic -%endif - %if "%theme" == "SMO" || "%theme" == "LeapMicro" %define with_storage_ng 1 %define with_ssl_hmac 0 @@ -695,7 +668,7 @@ AutoReqProv: off Summary: Installation Image Files for %theme License: GPL-2.0-or-later Group: Metapackages -Version: 17.53 +Version: 17.54 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)