Accepting request 875283 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/875283
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=126

installation-images-16.36.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc6428624095c9d10b8f879dda9ecdc9642352bb83bda3bbe7ff99464ef2422e
-size 204952

installation-images-16.47.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d96a0828d8ebad9bd057be5688cea0ab779c8c27e85f327857e5b5b238c62153
+size 205756

installation-images.changes

@@ -1,3 +1,103 @@
+--------------------------------------------------------------------
+Thu Feb 25 14:26:30 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#460
+- go back to plymouth-theme-tribar (bsc#1182755)
+- adjust spec file
+- 16.47
+
+--------------------------------------------------------------------
+Tue Feb 23 09:08:16 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#459
+- fix adapting grub.cfg for different architectures (bsc#1182593)
+- 16.46
+
+--------------------------------------------------------------------
+Mon Feb 22 11:44:59 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#458
+- Do not use shim on aarch64 for SLE Micro (based on SP2)
+- 16.45
+
+--------------------------------------------------------------------
+Fri Feb 19 17:30:02 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#457
+- fix kernel & initrd location for x86_64 (bsc#1182239)
+- 16.44
+
+--------------------------------------------------------------------
+Fri Feb 19 16:19:54 UTC 2021 - wfeldt@opensuse.org
+
+- fix library dependency check
+- 16.43
+
+--------------------------------------------------------------------
+Fri Feb 19 13:07:05 UTC 2021 - wfeldt@opensuse.org
+
+- drop linuxefi/initrdefi on x86_64
+
+--------------------------------------------------------------------
+Fri Feb 19 12:56:10 UTC 2021 - wfeldt@opensuse.org
+
+- enable shim on aarch64
+
+--------------------------------------------------------------------
+Thu Feb 18 18:11:55 UTC 2021 - wfeldt@opensuse.org
+
+- unify all EFI-using grub configurations into a single config file
+  (bsc#1182239)
+
+--------------------------------------------------------------------
+Thu Feb 18 17:03:55 UTC 2021 - wfeldt@opensuse.org
+
+- Use one grub.cfg for all ARM architectures
+
+--------------------------------------------------------------------
+Thu Feb 18 15:35:54 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#455
+- allow wildcards in modinfo firmware names (bsc#1180336)
+- 16.42
+
+--------------------------------------------------------------------
+Thu Feb 18 13:59:59 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#454
+- spec: no longer have ports project for Leap since 15.3
+- 16.41
+
+--------------------------------------------------------------------
+Thu Feb 18 13:58:41 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#452
+- remove some obsolete parts from installation-images (bsc#1182291)
+- rewrite check_libs script
+- fix zenworks image build
+- 16.40
+
+--------------------------------------------------------------------
+Tue Feb 16 15:59:53 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#453
+- Add kernel modules necessary for Raspberry Pi 4 (bsc#1180336)
+- 16.39
+
+--------------------------------------------------------------------
+Tue Feb 16 08:35:06 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#449
+- etc: update module.config to match 5.11 (bsc#1182301)
+- 16.38
+
+--------------------------------------------------------------------
+Wed Feb 10 13:39:16 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#451
+- Replace Raleway fonts by Poppins (jsc#SLE-14772)
+- 16.37
+
 --------------------------------------------------------------------
 Mon Feb 1 09:21:18 UTC 2021 - wfeldt@opensuse.org
 

installation-images.spec

@@ -63,11 +63,7 @@ ExclusiveArch:  do_not_build
 %if "%{the_version}" == ""
 %error "bad version string"
 %endif
-%ifarch %arm aarch64 ppc64 ppc64le
-%define net_repo https://download.opensuse.org/ports/%{the_arch}/distribution/leap/%{the_version}/repo/oss/
-%else
 %define net_repo https://download.opensuse.org/distribution/leap/%{the_version}/repo/oss
-%endif
 %else
 %define with_exfat 1
 %ifarch %arm aarch64 ppc64 ppc64le
@@ -94,6 +90,10 @@ ExclusiveArch:  do_not_build
 %ifnarch %ix86
 %define theme SMO
 %endif
+# SMO is built based on 15-SP2, which does not include shim for aarch64
+%ifarch aarch64
+%define with_shim 0
+%endif
 %endif
 %endif
 
@@ -438,7 +438,7 @@ BuildRequires:  perl-XML-Simple
 BuildRequires:  perl-solv
 BuildRequires:  pinentry
 BuildRequires:  python3-websockify
-BuildRequires:  raleway-fonts
+BuildRequires:  google-poppins-fonts
 BuildRequires:  samba
 BuildRequires:  snapper
 BuildRequires:  suse-module-tools
@@ -456,13 +456,8 @@ BuildRequires:  plymouth
 BuildRequires:  plymouth-branding
 BuildRequires:  plymouth-plugin-script
 BuildRequires:  plymouth-scripts
-# SLE needs to stay with tribar
-%if 0%{?is_opensuse}
-BuildRequires:  plymouth-branding-openSUSE
-%else
 BuildRequires:  plymouth-theme-tribar
 %endif
-%endif
 BuildRequires:  klogd
 BuildRequires:  ltrace
 BuildRequires:  nscd
@@ -632,6 +627,9 @@ BuildRequires:  raspberrypi-firmware
 BuildRequires:  raspberrypi-firmware-config
 BuildRequires:  raspberrypi-firmware-dt
 BuildRequires:  u-boot-rpiarm64
+%if %with_shim
+BuildRequires:  shim
+%endif
 %endif
 %ifarch %arm
 BuildRequires:  grub2-arm-efi
@@ -653,7 +651,7 @@ AutoReqProv:    off
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0-or-later
 Group:          Metapackages
-Version:        16.36
+Version:        16.47
 Release:        0
 Provides:       installation-images = %version-%release
 Conflicts:      otherproviders(installation-images)