X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=grub2.spec;h=59388fb0cef73be4afff4654cf9c826faf9ecdba;hp=c158e449bce5af89b4ad367917785501e6a43f87;hb=HEAD;hpb=8ab80f53099e357a531b30a27c15db861083d6b2 diff --git a/grub2.spec b/grub2.spec index c158e44..4b4f121 100644 --- a/grub2.spec +++ b/grub2.spec @@ -73,7 +73,7 @@ %define platforms %{?with_coreboot:coreboot} %{?with_ieee1275:ieee1275} %{?with_multiboot:multiboot} %{?with_qemu:qemu} %{?with_xen:xen} %{?with_xen_pvh:xen_pvh} %{?with_efi:efi} %{?with_pc:pc} %endif %ifarch %{arm} -%define platforms %{?with_efi:efi} %{?with_uboot:uboot} +%define platforms %{?with_coreboot:coreboot} %{?with_efi:efi} %{?with_uboot:uboot} %endif %ifarch aarch64 ia64 riscv32 riscv64 %define platforms efi @@ -143,12 +143,12 @@ Summary(hu.UTF-8): GRUB2 - rendszerbetöltő x86 és ppc gépekhez Summary(pl.UTF-8): GRUB2 - bootloader dla x86 i ppc Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2 Name: grub2 -Version: 2.06 -Release: 3 +Version: 2.12 +Release: 1 License: GPL v2 Group: Base Source0: https://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz -# Source0-md5: cf0fd928b1e5479c8108ee52cb114363 +# Source0-md5: 60c564b1bdc39d8e43b3aab4bc0fb140 Source1: update-grub Source2: update-grub.8 Source3: grub.sysconfig @@ -164,13 +164,10 @@ Patch9: just-say-linux.patch Patch10: ignore-kernel-symlinks.patch Patch11: initrd-search.patch Patch12: %{name}-cfg.patch -Patch13: efi-net-fix.patch Patch14: blscfg.patch Patch15: restricted.patch -Patch16: 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch -Patch17: 0268-grub_fs_probe-dprint-errors-from-filesystems.patch URL: http://www.gnu.org/software/grub/ -BuildRequires: autoconf >= 2.63 +BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1:1.11.1-1 BuildRequires: bison >= 2.3 BuildRequires: device-mapper-devel >= 1.02.34 @@ -196,13 +193,14 @@ BuildRequires: gettext-tools >= 0.18.3 BuildRequires: glibc-localedb-all BuildRequires: glibc-static BuildRequires: help2man -BuildRequires: libfuse-devel +BuildRequires: libfuse3-devel BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: pkgconfig -BuildRequires: python >= 1:2.6 -BuildRequires: python-modules >= 1:2.6 +BuildRequires: python3 +BuildRequires: python3-modules BuildRequires: rpm >= 4.4.9-56 +BuildRequires: rpm-build >= 4.6 BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: sed >= 4.0 BuildRequires: tar >= 1:1.22 @@ -534,15 +532,17 @@ Motyw starfield dla GRUB-a. %patch10 -p1 %patch11 -p1 %patch12 -p0 -%patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 # we don't have C.utf-8 and need an UTF-8 locale for build sed -i -e 's/LC_ALL=C.UTF-8/LC_ALL=en_US.utf-8/g' po/Makefile* po/Rules* +# missing in tarball +cat > grub-core/extra_deps.lst < /boot/grub/custom.cfg if [ -f %{_sysconfdir}/grub.d/custom.cfg.rpmsave ]; then cp -f %{_grubdir}/custom.cfg{,.rpmnew} @@ -702,13 +703,10 @@ fi %attr(755,root,root) %{_sbindir}/grub-bios-setup %{_mandir}/man8/grub-bios-setup.8* %endif -%ifarch %{ix86} %{x8664} x32 %attr(755,root,root) %{_sbindir}/grub-mkimage %{_mandir}/man1/grub-mkimage.1* -%else %attr(755,root,root) %{_sbindir}/grub-probe %{_mandir}/man8/grub-probe.8* -%endif %ifarch sparc64 %attr(755,root,root) %{_sbindir}/grub-sparc64-setup %{_mandir}/man8/grub-sparc64-setup.8* @@ -747,8 +745,8 @@ fi # XXX: check this locale dir location and if it is neccesaary to exist on /boot %dir %{_libexecdir}/locale -%config(noreplace) %verify(not md5 mtime size) %{_grubdir}/grub.cfg -%config(noreplace) %verify(not md5 mtime size) %{_grubdir}/custom.cfg +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_grubdir}/grub.cfg +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_grubdir}/custom.cfg # generated by grub at runtime %ghost %{_grubdir}/device.map @@ -760,14 +758,10 @@ fi %attr(755,root,root) /lib/grub.d/00_header %attr(755,root,root) /lib/grub.d/10_linux %attr(755,root,root) /lib/grub.d/20_linux_xen +%attr(755,root,root) /lib/grub.d/25_bli %attr(755,root,root) /lib/grub.d/30_os-prober %attr(755,root,root) /lib/grub.d/41_custom -%ifarch %{ix86} %{x8664} x32 -%attr(755,root,root) %{_sbindir}/grub-probe -%{_mandir}/man8/grub-probe.8* -%endif - %{_infodir}/grub*.info* %dir %{_datadir}/grub/themes @@ -796,7 +790,7 @@ fi %{_libexecdir}/%{arc_arch}-arc/*.module %{_libexecdir}/%{arc_arch}-arc/config.h %{_libexecdir}/%{arc_arch}-arc/gdb_grub -%{_libexecdir}/%{arc_arch}-arc/gmodule.pl +%{_libexecdir}/%{arc_arch}-arc/gdb_helper.py %{_libexecdir}/%{arc_arch}-arc/kernel.exec %{_libexecdir}/%{arc_arch}-arc/kernel.img %endif @@ -811,7 +805,7 @@ fi %{_libexecdir}/%{coreboot_arch}-coreboot/*.module %{_libexecdir}/%{coreboot_arch}-coreboot/config.h %{_libexecdir}/%{coreboot_arch}-coreboot/gdb_grub -%{_libexecdir}/%{coreboot_arch}-coreboot/gmodule.pl +%{_libexecdir}/%{coreboot_arch}-coreboot/gdb_helper.py %{_libexecdir}/%{coreboot_arch}-coreboot/kernel.exec %{_libexecdir}/%{coreboot_arch}-coreboot/kernel.img %if %{with efiemu} @@ -830,7 +824,7 @@ fi %{_libexecdir}/%{efi_arch}-efi/*.module %{_libexecdir}/%{efi_arch}-efi/config.h %{_libexecdir}/%{efi_arch}-efi/gdb_grub -%{_libexecdir}/%{efi_arch}-efi/gmodule.pl +%{_libexecdir}/%{efi_arch}-efi/gdb_helper.py %{_libexecdir}/%{efi_arch}-efi/kernel.exec %{_libexecdir}/%{efi_arch}-efi/kernel.img %endif @@ -845,7 +839,7 @@ fi %{_libexecdir}/%{ieee1275_arch}-ieee1275/*.module %{_libexecdir}/%{ieee1275_arch}-ieee1275/config.h %{_libexecdir}/%{ieee1275_arch}-ieee1275/gdb_grub -%{_libexecdir}/%{ieee1275_arch}-ieee1275/gmodule.pl +%{_libexecdir}/%{ieee1275_arch}-ieee1275/gdb_helper.py %{_libexecdir}/%{ieee1275_arch}-ieee1275/kernel.exec %{_libexecdir}/%{ieee1275_arch}-ieee1275/kernel.img %if %{with efiemu} @@ -863,7 +857,7 @@ fi %{_libexecdir}/i386-multiboot/*.module %{_libexecdir}/i386-multiboot/config.h %{_libexecdir}/i386-multiboot/gdb_grub -%{_libexecdir}/i386-multiboot/gmodule.pl +%{_libexecdir}/i386-multiboot/gdb_helper.py %{_libexecdir}/i386-multiboot/kernel.exec %{_libexecdir}/i386-multiboot/kernel.img %if %{with efiemu} @@ -881,7 +875,7 @@ fi %{_libexecdir}/i386-pc/*.module %{_libexecdir}/i386-pc/config.h %{_libexecdir}/i386-pc/gdb_grub -%{_libexecdir}/i386-pc/gmodule.pl +%{_libexecdir}/i386-pc/gdb_helper.py %{_libexecdir}/i386-pc/boot.image %{_libexecdir}/i386-pc/boot.img %{_libexecdir}/i386-pc/boot_hybrid.image @@ -913,7 +907,7 @@ fi %{_libexecdir}/%{qemu_arch}-%{qemu_plat}/*.module %{_libexecdir}/%{qemu_arch}-%{qemu_plat}/config.h %{_libexecdir}/%{qemu_arch}-%{qemu_plat}/gdb_grub -%{_libexecdir}/%{qemu_arch}-%{qemu_plat}/gmodule.pl +%{_libexecdir}/%{qemu_arch}-%{qemu_plat}/gdb_helper.py %{_libexecdir}/%{qemu_arch}-%{qemu_plat}/boot.image %{_libexecdir}/%{qemu_arch}-%{qemu_plat}/boot.img %{_libexecdir}/%{qemu_arch}-%{qemu_plat}/kernel.exec @@ -930,7 +924,7 @@ fi %{_libexecdir}/arm-uboot/*.module %{_libexecdir}/arm-uboot/config.h %{_libexecdir}/arm-uboot/gdb_grub -%{_libexecdir}/arm-uboot/gmodule.pl +%{_libexecdir}/arm-uboot/gdb_helper.py %{_libexecdir}/arm-uboot/kernel.exec %{_libexecdir}/arm-uboot/kernel.img %endif @@ -945,7 +939,7 @@ fi %{_libexecdir}/%{xen_arch}-xen/*.module %{_libexecdir}/%{xen_arch}-xen/config.h %{_libexecdir}/%{xen_arch}-xen/gdb_grub -%{_libexecdir}/%{xen_arch}-xen/gmodule.pl +%{_libexecdir}/%{xen_arch}-xen/gdb_helper.py %{_libexecdir}/%{xen_arch}-xen/kernel.exec %{_libexecdir}/%{xen_arch}-xen/kernel.img %endif @@ -960,7 +954,7 @@ fi %{_libexecdir}/i386-xen_pvh/*.module %{_libexecdir}/i386-xen_pvh/config.h %{_libexecdir}/i386-xen_pvh/gdb_grub -%{_libexecdir}/i386-xen_pvh/gmodule.pl +%{_libexecdir}/i386-xen_pvh/gdb_helper.py %{_libexecdir}/i386-xen_pvh/kernel.exec %{_libexecdir}/i386-xen_pvh/kernel.img %if %{with efiemu}