Hello community, here is the log from the commit of package tboot for openSUSE:Factory checked in at 2018-02-20 17:55:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tboot (Old) and /work/SRC/openSUSE:Factory/.tboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tboot" Tue Feb 20 17:55:30 2018 rev:30 rq:578146 version:20170711_1.9.6 Changes: -------- --- /work/SRC/openSUSE:Factory/tboot/tboot.changes 2017-11-16 14:04:31.529990698 +0100 +++ /work/SRC/openSUSE:Factory/.tboot.new/tboot.changes 2018-02-20 17:55:42.417099729 +0100 @@ -1,0 +2,8 @@ +Mon Feb 12 13:27:20 UTC 2018 - matthias.gerstner@suse.com + +- tboot-distributor.patch: don't add GNU/Linux to grub menu entries. SUSE's + grub2 itself doesn't do it as well. (bnc#1078262) +- perform update of bootloader configuration after installation via + %posttrans. (bnc#1078262) + +------------------------------------------------------------------- New: ---- tboot-distributor.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tboot.spec ++++++ --- /var/tmp/diff_new_pack.GBApMh/_old 2018-02-20 17:55:43.729052489 +0100 +++ /var/tmp/diff_new_pack.GBApMh/_new 2018-02-20 17:55:43.733052345 +0100 @@ -1,7 +1,7 @@ # # spec file for package tboot # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,11 +29,22 @@ Patch4: tboot-grub2-fix-xen-submenu-name.patch Patch5: tboot-openssl-1-1-0.patch Patch6: tboot-CVE-2017-16837.patch +Patch7: tboot-distributor.patch # PATCH-FIX-UPSTREAM -- https://sourceforge.net/p/tboot/code/merge-requests/1/ BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %{ix86} x86_64 BuildRequires: openssl-devel BuildRequires: trousers-devel -ExclusiveArch: %{ix86} x86_64 + +%if 0%{?suse_version} > 1320 +BuildRequires: update-bootloader-rpm-macros +%endif + +%if 0%{?update_bootloader_requires:1} +%update_bootloader_requires +%else +Requires: perl-Bootloader +%endif %description Trusted Boot (tboot) is a pre-kernel/VMM module that uses Intel(R) @@ -46,6 +57,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build export CFLAGS="%{optflags}" @@ -85,4 +97,14 @@ %{_sysconfdir}/grub.d/20_linux_tboot %{_sysconfdir}/grub.d/20_linux_xen_tboot +%post +%if 0%{?update_bootloader_check_type_reinit_post:1} +%update_bootloader_check_type_reinit_post grub2 grub2-efi +%else +/sbin/update-bootloader --reinit || true +%endif + +%posttrans +%{?update_bootloader_posttrans} + %changelog ++++++ tboot-distributor.patch ++++++ Index: tboot-1.9.6/tboot/20_linux_tboot =================================================================== --- tboot-1.9.6.orig/tboot/20_linux_tboot +++ tboot-1.9.6/tboot/20_linux_tboot @@ -72,7 +72,7 @@ CLASS="--class gnu-linux --class gnu --c if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" + OS="${GRUB_DISTRIBUTOR}" CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}" fi Index: tboot-1.9.6/tboot/20_linux_xen_tboot =================================================================== --- tboot-1.9.6.orig/tboot/20_linux_xen_tboot +++ tboot-1.9.6/tboot/20_linux_xen_tboot @@ -63,7 +63,7 @@ CLASS="--class gnu-linux --class gnu --c if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" + OS="${GRUB_DISTRIBUTOR}" CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" fi