This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via ec89cb13f8ea2faeb174e72d051d0f528d4ab40d (commit) from 6d864f42bc0e873c3df088b7b115d3b32e827109 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ec89cb13f8ea2faeb174e72d051d0f528d4ab40d Author: Michael Tremer Date: Thu May 17 19:28:31 2012 +0200 grub: Update to 2.00~beta5. This commit removes the old "theme" and the splash screen. Both should be provided by the system-logos package soon. ----------------------------------------------------------------------- Summary of changes: grub/05_theme | 52 --------------------------- grub/default/grub | 1 - grub/grub.nm | 43 +++++++--------------- grub/patches/grub-1.99-just-say-linux.patch | 5 +-- 4 files changed, 16 insertions(+), 85 deletions(-) delete mode 100644 grub/05_theme Difference in files: diff --git a/grub/05_theme b/grub/05_theme deleted file mode 100644 index 0d2bd16..0000000 --- a/grub/05_theme +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -e - -source /usr/lib/grub/grub-mkconfig_lib - -set_mono_theme() -{ -cat << EOF -set menu_color_normal=white/black -set menu_color_highlight=black/white -EOF -} - -# check for usable backgrounds -use_bg=false -if [ "$GRUB_TERMINAL_OUTPUT" = "gfxterm" ] ; then -for i in {/boot/grub,/usr/share/images/desktop-base}/splash.{png,tga} ; do -if is_path_readable_by_grub $i ; then -bg=$i -case ${bg} in -*.png) reader=png ;; -*.tga) reader=tga ;; -*.jpg|*.jpeg) reader=jpeg ;; -esac -if test -e /boot/grub/${reader}.mod ; then -echo "Found background: `basename ${bg}`" >&2 -use_bg=true -break -fi -fi -done -fi - -# set the background if possible -if ${use_bg} ; then -prepare_grub_to_access_device `${grub_probe} --target=device ${bg}` -cat << EOF -insmod ${reader} -if background_image `make_system_path_relative_to_its_root ${bg}` ; -then -set color_normal=black/black -set color_highlight=magenta/black -else -EOF -fi - -# otherwise, set a monochromatic theme for IPFire -if ${use_bg} ; then -set_mono_theme | sed -e "s/^/ /g" -echo "fi" -else -set_mono_theme -fi diff --git a/grub/default/grub b/grub/default/grub index 0fe9d7c..603e78f 100644 --- a/grub/default/grub +++ b/grub/default/grub @@ -1,7 +1,6 @@ GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)" GRUB_DEFAULT=saved -GRUB_SAVEDEFAULT=true # GRUB_TERMINAL="serial console" # GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200" GRUB_CMDLINE_LINUX="quiet rhgb" diff --git a/grub/grub.nm b/grub/grub.nm index e9ec433..edd42da 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -4,8 +4,10 @@ ############################################################################### name = grub -version = 1.99 -release = 6 +version = 2.00 +prerelease = beta5 +release = 0.1.%{prerelease} +thisapp = %{name}-%{version}~%{prerelease} sup_arches = x86_64 i686 groups = System/Boot @@ -20,7 +22,8 @@ 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 build requires @@ -28,6 +31,7 @@ build autogen automake bison + bzip2-devel flex freetype-devel gettext @@ -37,17 +41,9 @@ build end 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* */Makefile* \ - gentpl.py util/grub-*.in - - ./autogen.sh - # Create a copy of the source tree to build # an EFI enabled version of grub. - cp -R . %{DIR_SRC}/%{thisapp}-efi + cp -pR . %{DIR_SRC}/%{thisapp}-efi end # As the modules contain always 32 bit code, they @@ -73,7 +69,6 @@ build ./configure \ %{configure_options} \ --with-platform=efi \ - --program-transform-name=s,grub,grub-efi, \ CFLAGS="$(echo %{CFLAGS} | sed \ -e 's/-O.//g' \ -e 's/-fstack-protector//g' \ @@ -98,10 +93,6 @@ build cd ../%{thisapp}-efi make install DESTDIR=%{BUILDROOT} - mv -v %{BUILDROOT}/etc/bash_completion.d/grub{,-efi} - sed -e "s,grub/grub-mkconfig_lib,grub-efi/grub-mkconfig_lib," \ - -i %{BUILDROOT}%{sbindir}/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 @@ -111,21 +102,18 @@ build cd - make install DESTDIR=%{BUILDROOT} - # 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 end + + debuginfo_strict_build_id = false end quality-agent whitelist_nx - /sbin/*|/usr/bin/* + /usr/bin/* end end @@ -135,6 +123,7 @@ packages gettext os-prober /usr/share/X11/fonts/misc/unifont.pcf.gz + system-logos end configfiles @@ -165,11 +154,7 @@ packages files /boot/efi - /etc/bash_completion.d/grub-efi /etc/grub-efi.cfg - %{sbindir}/grub-efi-* - %{bindir}/grub-efi-* - %{prefix}/lib/grub-efi end end diff --git a/grub/patches/grub-1.99-just-say-linux.patch b/grub/patches/grub-1.99-just-say-linux.patch index 389b163..98ab2b7 100644 --- a/grub/patches/grub-1.99-just-say-linux.patch +++ b/grub/patches/grub-1.99-just-say-linux.patch @@ -3,7 +3,6 @@ From: Peter Jones Date: Mon, 14 Mar 2011 14:27:42 -0400 Subject: [PATCH] Don't say "GNU/Linux" in generated menus. -In Fedora and RHEL we just call it Linux. --- util/grub.d/10_linux.in | 4 ++-- util/grub.d/20_linux_xen.in | 4 ++-- @@ -18,7 +17,7 @@ index a09c3e6..0b0df78 100644 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux -+ OS=Linux ++ OS="$(sed 's, release .*$,,g' /etc/system-release) Linux" else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" + OS="${GRUB_DISTRIBUTOR} Linux" @@ -34,7 +33,7 @@ index ee49cd9..10422b0 100644 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux -+ OS=Linux ++ OS="$(sed 's, release .*$,,g' /etc/system-release) Linux" else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" + OS="${GRUB_DISTRIBUTOR} Linux" hooks/post-receive -- IPFire 3.x development tree