json-c: Update to version 0.17-20230812

[ipfire-3.x.git] / grub / grub.nm

diff --git a/grub/grub.nm b/grub/grub.nm
index cea1a68bdb96a87a22e22e85337785a2a038ae08..263a36d56bad95249413406d4b4302f47e4a449b 100644 (file)
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -4,85 +4,127 @@
 ###############################################################################
 
 name       = grub
-version    = 1.99
-release    = 3
-sup_arches = i686
+version    = 2.06
+release    = 2
 
 groups     = System/Boot
-url        = http://www.gnu.org/software/grub/
-license    = GPLv2+
+url        = https://www.gnu.org/software/grub/
+license    = GPLv3
 summary    = Grand Unified Boot Loader.
 
 description
-       GRUB (Grand Unified Boot Loader) is an experimental boot loader \
-       capable of booting into most free operating systems - Linux, FreeBSD, \
-       NetBSD, GNU Mach, and others as well as most commercial operating \
+       GRUB (Grand Unified Boot Loader) is an experimental boot loader
+       capable of booting into most free operating systems - Linux, FreeBSD,
+       NetBSD, GNU Mach, and others as well as most commercial operating
        systems.
 end
 
-source_dl  = http://ftp.gnu.org/gnu/grub/
+source_dl  = https://ftp.gnu.org/gnu/grub/
+sources    = %{thisapp}.tar.xz
 
 build
+       arches = aarch64 x86_64
+
        requires
                autoconf
                automake
                bison
+               bzip2-devel
                flex
                freetype-devel
                gettext
+               gettext-devel
+               libdevmapper-devel
                ncurses-devel
+               python3
                zlib-devel
        end
 
-       # Can only use very basic CFLAGS.
-       export CFLAGS = -O2 -pipe
-       export CXXFLAGS = %{CFLAGS}
+       # Don't leak our CFLAGS to boot code
+       export HOST_CFLAGS  = %{CFLAGS}
+       export HOST_LDFLAGS = %{LDFLAGS}
 
-       configure_options += \
-               --sysconfdir=/etc \
-               --sbindir=/sbin \
-               --with-platform=pc
+       platforms = efi
 
-       install
-               make install DESTDIR=%{BUILDROOT}
+       if "%{DISTRO_PLATFORM}" == "x86"
+               platforms += pc
+       end
 
-               # Install theme file
-               install -m 0744 %{DIR_SOURCE}/05_theme %{BUILDROOT}/etc/grub.d/
+       prepare_cmds
+               PYTHON=%{python3} ./autogen.sh
 
-               # Install splash background
-               mkdir -pv %{BUILDROOT}/boot/grub
-               install %{DIR_SOURCE}/splash.png %{BUILDROOT}/boot/grub
+               for platform in %{platforms}; do
+                       cp -r %{DIR_APP} %{DIR_APP}-${platform}
+               done
+       end
 
-               # Install empty configuration file.
-               touch %{BUILDROOT}/boot/grub/grub.cfg
+       # As the modules contain always 32 bit code, they
+       # should be living in /usr/lib.
+       libdir = %{prefix}/lib
+
+       build
+               for platform in %{platforms}; do
+                       pushd %{DIR_APP}-${platform}
+                       ./configure \
+                               %{configure_options} \
+                               --with-platform=${platform} \
+                               --disable-werror \
+                               CFLAGS= LDFLAGS=
+
+                       make %{PARALLELISMFLAGS}
+                       popd
+               done
        end
-end
 
-quality-agent
-       whitelist_nx
-               /sbin/*|/usr/bin/*
+       install
+               for platform in %{platforms}; do
+                       pushd %{DIR_APP}-${platform}
+                       make install DESTDIR=%{BUILDROOT}
+                       popd
+               done
+
+               # Install empty configuration file.
+               mkdir -pv %{BUILDROOT}/boot/grub
+               touch %{BUILDROOT}/boot/grub/grub.cfg
+               ln -svf ../boot/grub/grub.cfg %{BUILDROOT}%{sysconfdir}/grub2.cfg
+
+               # Don't ship the default theme, replace it by our own one.
+               rm -rfv %{BUILDROOT}/boot/grub/themes/starfield \
+                       %{datadir}/grub/themes
+               mkdir -pv %{BUILDROOT}/boot/grub/themes/system
+               cp -rfv %{DIR_SOURCE}/theme/* \
+                       %{BUILDROOT}/boot/grub/themes/system/
+
+               # Prepare the fonts.
+               mkdir -pv %{BUILDROOT}/boot/grub/themes/system
+               pushd %{BUILDROOT}/boot/grub/themes/system/
+               %{BUILDROOT}%{bindir}/grub-mkfont -o DejaVuSans-10.pf2 -s 10 \
+                       %{datadir}/fonts/dejavu/DejaVuSans.ttf
+               %{BUILDROOT}%{bindir}/grub-mkfont -o DejaVuSans-12.pf2 -s 12 \
+                       %{datadir}/fonts/dejavu/DejaVuSans.ttf
+               %{BUILDROOT}%{bindir}/grub-mkfont -o DejaVuSans-Bold-14.pf2 \
+                       -s 14 %{datadir}/fonts/dejavu/DejaVuSans-Bold.ttf
+               popd
        end
 end
 
 packages
        package %{name}
                requires
+                       efibootmgr
                        gettext
-                       os-prober
-                       /usr/share/X11/fonts/misc/unifont.pcf.gz
+                       system-logos >= 2
+               end
+
+               # An EFI version of grub does not exist any more.
+               obsoletes
+                       grub-efi <= 2.0.0-2
                end
 
                configfiles
                        /boot/grub/grub.cfg
                        /etc/default/grub
                end
-
-               # Generate grub compatible font for graphical boot menu
-               # This only converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters
-               script postin
-                       /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \
-                               --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f /usr/share/X11/fonts/misc/unifont.pcf.gz
-               end
        end
 
        package %{name}-debuginfo