]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blobdiff - grub/grub.nm
samba: build with needed packages
[people/amarx/ipfire-3.x.git] / grub / grub.nm
index feb62bad781aa039e98be67d0c5be90b888f6360..cd3974347ceb303eba38eaf0a0bd21adea54b848 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = grub
-version    = 1.99
-release    = 4
+version    = 2.00
+release    = 5.1
 sup_arches = x86_64 i686
 
 groups     = System/Boot
@@ -20,7 +20,11 @@ description
        systems.
 end
 
-source_dl  = http://ftp.gnu.org/gnu/grub/
+source_dl  = http://ftp.gnu.org/gnu/grub/ ftp://alpha.gnu.org/gnu/grub/
+sources    = %{thisapp}.tar.xz
+
+# Unifont
+unifont = /usr/share/X11/fonts/misc/unifont.pcf.gz
 
 build
        requires
@@ -28,83 +32,83 @@ build
                autogen
                automake
                bison
+               bzip2-devel
+               dejavu-fonts-sans-fonts
                flex
                freetype-devel
                gettext
                libdevmapper-devel
                ncurses-devel
+               paxctl
                zlib-devel
+               %{unifont}
        end
 
-       # Can only use very basic CFLAGS.
-       export CFLAGS = -Os -pipe
-       export CXXFLAGS = %{CFLAGS}
-
        prepare_cmds
-               # Replace pkglib_DATA (automake 1.11.2 incompatibility)
-               sed -i -e "s/pkglib_DATA/pkgdata_DATA/g" \
-                       -e "s/pkglib_SCRIPTS/pkgdata_SCRIPTS/g" \
-                       Makefile.am conf/Makefile.common \
-                       gentpl.py util/grub-*.in
-
+               cp -vf %{unifont} unifont.pcf.gz
                ./autogen.sh
-
-               # Create a copy of the source tree to build
-               # an EFI enabled version of grub.
-               cp -R . %{DIR_SRC}/%{thisapp}-efi
        end
 
+       # As the modules contain always 32 bit code, they
+       # should be living in /usr/lib.
+       libdir = %{prefix}/lib
+
        configure_options += \
-               --sbindir=/sbin \
-               --with-platform=pc
-
-       build_cmds
-               cd ../%{thisapp}-efi
-               #./autogen.sh
-               ./configure %{configure_options} \
-                       --with-platform=efi \
-                       --program-transform-name=s,grub,grub-efi,
-               make %{PARALLELISMFLAGS}
-
-               ./grub-mkimage \
-                       -O i386-efi \
-                       -p /EFI/%{DISTRO_SNAME}/grub-efi \
-                       -o grub.efi \
-                       -d grub-core part_gpt hfsplus fat ext2 btrfs normal chain \
-                       boot configfile linux appleldr minicmd loadbios reboot halt \
-                       search font gfxterm echo video efi_gop efi_uga
-       end
+               --target="i386" \
+               --with-platform=pc \
+               --program-transform-name=s,grub,grub, \
+               --disable-werror \
+               CFLAGS="$(echo %{CFLAGS} | sed \
+                       -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' \
+                       -e 's/-fstack-protector-strong//g' \
+                       -e 's/-fstack-protector-all//g' \
+                       -e 's/-fstack-protector//g' \
+                       -e 's/-fPIC//g' \
+                       -e 's/--param=ssp-buffer-size=4//g' \
+                       -e 's/-mregparm=3/-mregparm=4/g' \
+                       -e 's/-fexceptions//g' \
+                       -e 's/-m64//g' \
+                       -e 's/-fasynchronous-unwind-tables//g' )"
 
        install_cmds
-               cd ../%{thisapp}-efi
-               make install DESTDIR=%{BUILDROOT}
-
-               mv -v %{BUILDROOT}/etc/bash_completion.d/grub{,-efi}
-               mv -v %{BUILDROOT}/usr/lib/grub{,-efi}
-               sed -e "s,grub/grub-mkconfig_lib,grub-efi/grub-mkconfig_lib," \
-                       -i %{BUILDROOT}/sbin/grub-efi-mkconfig
-
-               install -m 755 -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/
-               install -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi
-               touch %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg
-               ln -svf ../boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg %{BUILDROOT}/etc/grub-efi.cfg
-               install -m 755 grub.efi %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.efi
-
-               # Install theme file
-               install -m 0744 %{DIR_SOURCE}/05_theme %{BUILDROOT}/etc/grub.d/
-
-               # Install splash background
-               mkdir -pv %{BUILDROOT}/boot/grub
-               install %{DIR_SOURCE}/splash.png %{BUILDROOT}/boot/grub
-
                # 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
+
+               # Disable hardening.
+               paxctl -mpes \
+                       %{BUILDROOT}%{sbindir}/grub-bios-setup \
+                       %{BUILDROOT}%{sbindir}/grub-probe
+
+               paxctl -mpex \
+                       %{BUILDROOT}%{bindir}/grub-script-check
        end
+
+       debuginfo_strict_build_id = false
 end
 
 quality-agent
        whitelist_nx
-               /sbin/*|/usr/bin/*
+               %{bindir}/*|%{sbindir}/*
        end
 end
 
@@ -113,42 +117,17 @@ packages
                requires
                        gettext
                        os-prober
-                       /usr/share/X11/fonts/misc/unifont.pcf.gz
+                       system-logos >= 2
                end
 
-               configfiles
-                       /boot/grub/grub.cfg
-                       /etc/default/grub
+               # An EFI version of grub does not exist any more.
+               obsoletes
+                       grub-efi <= 2.0.0-2
                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}-efi
-               description
-                       EFI version of GRUB, the Grand Unified Boot Loader.
-               end
-               summary = %{description}
-
-               requires += grub = %{thisver}
-
                configfiles
-                       /boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg
-               end
-
-               files
-                       /boot/efi
-                       /etc/bash_completion.d/grub-efi
-                       /etc/grub-efi.cfg
-                       /sbin/grub-efi-*
-                       /usr/bin/grub-efi-*
-                       /usr/lib/grub-efi
+                       /boot/grub/grub.cfg
+                       /etc/default/grub
                end
        end