diff --git a/.files b/.files
index 9daa45c..e289b3f 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 2ccd7b5..4003910 100644
--- a/.rev
+++ b/.rev
@@ -809,4 +809,18 @@ it wants then though.
797205
+
+ 77d4d787f4fb28ec2328713243d1dfa7
+ unknown
+
+ dimstar_suse
+ based on sr#800354: Add ppc64le for microos patterns boo#1171146
+
+- Get rid of legacy upgrade code from < 13.2
+- Don't require issue-generator, it's already pulled in by patterns
+- Turn Recommends of branding and logos into Supplements to just
+ hint the solver in case those packages are pulled in from
+ elsewhere (eg patterns).
+ 800366
+
diff --git a/groups.yml b/groups.yml
index 8c90288..358d08e 100644
--- a/groups.yml
+++ b/groups.yml
@@ -363,21 +363,21 @@ opensuse_microos:
- kernel-debug: [locked]
- openSUSE-MicroOS-release
- kernel-default
- - 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,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]
+ - patterns-microos-base: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-defaults: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-hardware: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-apparmor: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-selinux: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-sssd_ldap: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-ima_evm: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-cloud: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-desktop-kde: [aarch64,ppc64le,x86_64]
+ - patterns-microos-desktop-gnome: [aarch64,ppc64le,x86_64]
+ - patterns-microos-onlyDVD: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-microos-alt_onlyDVD: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-containers-container_runtime: [aarch64,ppc64le,s390x,x86_64]
+ - podman-cni-config: [aarch64,ppc64le,s390x,x86_64]
+ - kernel-default-base: [aarch64,ppc64le,s390x,x86_64]
- grub2-x86_64-efi: [x86_64]
- grub2-i386-pc: [x86_64]
- grub2-arm64-efi: [aarch64]
@@ -385,13 +385,13 @@ opensuse_microos:
opensuse_kubic:
- patterns-microos-desktop-kde: [locked]
- patterns-microos-desktop-gnome: [locked]
- - 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]
+ - patterns-containers-kubeadm: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-containers-container_runtime_kubernetes: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-containers-container_runtime: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-containers-kubic_worker: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-containers-kubic_admin: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-containers-kubernetes_utilities: [aarch64,ppc64le,s390x,x86_64]
+ - patterns-containers-kubic_loadbalancer: [aarch64,ppc64le,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 701d813..3cdee14 100644
--- a/openSUSE-MicroOS-release.spec.in
+++ b/openSUSE-MicroOS-release.spec.in
@@ -24,13 +24,12 @@ 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
PreReq: glibc >= 2.19
# in rare cases, 'ln' is not found...
Requires(post): coreutils
-Recommends: branding-openSUSE
-Recommends: distribution-logos-openSUSE-MicroOS
+Suggests: branding-openSUSE
+Suggests: distribution-logos-openSUSE-MicroOS
Suggests: openSUSE-build-key
Conflicts: distribution-release
Conflicts: kernel < 4.4
diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in
index a7d9153..9fc7093 100644
--- a/openSUSE-release.spec.in
+++ b/openSUSE-release.spec.in
@@ -29,14 +29,8 @@ Group: System/Fhs
Source100: weakremovers.inc
BuildRequires: skelcd-control-openSUSE
BuildRequires: skelcd-openSUSE
-# /etc/issue is no longer a default file, but is auto-generated at bootup
-Requires: issue-generator
-#PreReq: coreutils
-# the post scriptlets uses awk, boo#976913
-Requires(post): awk
-Requires(post): issue-generator
-Recommends: branding-openSUSE
-Recommends: distribution-logos-openSUSE-Tumbleweed
+Suggests: branding-openSUSE
+Suggests: distribution-logos-openSUSE-Tumbleweed
Suggests: openSUSE-build-key
Suggests: java-11-openjdk
Suggests: mariadb
@@ -249,21 +243,6 @@ ___CREATE_PRODUCT_FILES___
# this is a base product, create symlink
ln -s openSUSE.prod %{buildroot}%{_sysconfdir}/products.d/baseproduct
-%post
-# Upgrade path - if /etc/default/grub contains any of the DISTRIBUTOR= tags
-# we ever put, replace it with "", which means grub will use /etc/os-release to make something up
-if [ -f %{_sysconfdir}/default/grub ]; then
- DISTRIBUTOR=$(awk -F= '/^GRUB_DISTRIBUTOR/ {print $2}' %{_sysconfdir}/default/grub | tr -d '"')
- case "$DISTRIBUTOR" in
- "openSUSE" | \
- "openSUSE 13.1" | \
- "openSUSE 13.2")
- # replace GRUB_DISTRIBUTOR in %{_sysconfdir}/default/grub with ""
- sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=/" %{_sysconfdir}/default/grub
- ;;
- esac
-fi
-
%posttrans
# Launch the issue-generator: we have a new config file in /usr/lib/issue.d that needs to be represented
if [ -x %{_sbindir}/issue-generator ]; then