From 04b4c3e08453d9b433e34a7443cb30cdb4b8b0aa079ef54ad401f5e4ebf6fc86 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 18 Jun 2020 08:35:57 +0000 Subject: [PATCH] Accepting request 815261 from home:Guillaume_G:branches:openSUSE:Factory Have a bootable system for RPi3/4 - boo#1172574 OBS-URL: https://build.opensuse.org/request/show/815261 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=117 --- groups.yml | 13 +++++++++++++ openSUSE-MicroOS-release.spec.in | 6 +++--- openSUSE-release.spec.in | 4 ++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/groups.yml b/groups.yml index d220218..fbd7922 100644 --- a/groups.yml +++ b/groups.yml @@ -351,6 +351,13 @@ dvd: - inkscape - autoyast2 + # Have a bootable system for RPi3/4 - boo#1172574 + - raspberrypi-firmware: [aarch64] # bsc 1130015 + - raspberrypi-firmware-config: [aarch64] # bsc 1130015 + - raspberrypi-firmware-dt: [aarch64] # bsc 1130015 + - u-boot-rpiarm64: [aarch64] # bsc 1130015, jsc SLE-7276 / bsc 1164080 + - u-boot-rpiarm64-doc: [aarch64] # jsc SLE-7276 / bsc 1164080 + opensuse_microos: - dummy-release: [locked] - openSUSE-release: [locked] @@ -384,6 +391,12 @@ opensuse_microos: - grub2-powerpc-ieee1275: [ppc64le] - patterns-microos-basesystem: [ppc64le] - patterns-base-bootloader: [ppc64le] + # Have a bootable system for RPi3/4 - boo#1172574 + - raspberrypi-firmware: [aarch64] # bsc 1130015 + - raspberrypi-firmware-config: [aarch64] # bsc 1130015 + - raspberrypi-firmware-dt: [aarch64] # bsc 1130015 + - u-boot-rpiarm64: [aarch64] # bsc 1130015, jsc SLE-7276 / bsc 1164080 + - u-boot-rpiarm64-doc: [aarch64] # jsc SLE-7276 / bsc 1164080 opensuse_kubic: - patterns-microos-desktop-kde: [locked] diff --git a/openSUSE-MicroOS-release.spec.in b/openSUSE-MicroOS-release.spec.in index 4b1ad04..782df04 100644 --- a/openSUSE-MicroOS-release.spec.in +++ b/openSUSE-MicroOS-release.spec.in @@ -1,7 +1,7 @@ # # spec file for package openSUSE-MicroOS-release.spec # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,8 +42,6 @@ Provides: product-update() = dup # With more than one product in the FTP tree, yast needs to know which products are installable # The name is referenced by the control file as well 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 @@ -168,6 +166,8 @@ Provides: weakremover(libxtables11) Provides: weakremover(libzip4) Provides: weakremover(mt_st) Provides: weakremover(openssl-debuginfo) +# this package should only be available for the "basearchs" of a product +ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm %include %{SOURCE100} ___PRODUCT_PROVIDES___ ___PRODUCT_DEPENDENCIES___ diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in index 6e4fec4..6f4e42c 100644 --- a/openSUSE-release.spec.in +++ b/openSUSE-release.spec.in @@ -1,7 +1,7 @@ # # spec file for package openSUSE-release.spec # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,10 +31,10 @@ BuildRequires: skelcd-control-openSUSE BuildRequires: skelcd-openSUSE Suggests: branding-openSUSE Suggests: distribution-logos-openSUSE-Tumbleweed -Suggests: openSUSE-build-key Suggests: java-11-openjdk Suggests: mariadb Suggests: mariadb-client +Suggests: openSUSE-build-key Suggests: openssl-1_1 Conflicts: core-release <= 10 Conflicts: distribution-release