|
@@ -1,4 +1,4 @@
|
|
-%define efi_support 0
|
|
|
|
|
|
+%define efi_support 1
|
|
|
|
|
|
%ifarch %{ix86}
|
|
%ifarch %{ix86}
|
|
%define _host_cpu i386
|
|
%define _host_cpu i386
|
|
@@ -12,7 +12,7 @@ Summary: grub - a Multiboot boot loader.
|
|
Summary(ja): grub - マルチブートローダ
|
|
Summary(ja): grub - マルチブートローダ
|
|
Name: grub
|
|
Name: grub
|
|
Version: 0.97
|
|
Version: 0.97
|
|
-Release: 4%{?_dist_release}
|
|
|
|
|
|
+Release: 6%{?_dist_release}
|
|
License: GPL
|
|
License: GPL
|
|
Group: System Environment/Base
|
|
Group: System Environment/Base
|
|
URL: http://www.gnu.org/software/grub/
|
|
URL: http://www.gnu.org/software/grub/
|
|
@@ -20,26 +20,37 @@ URL: http://www.gnu.org/software/grub/
|
|
Source0: ftp://alpha.gnu.org/gnu/grub/%{name}-%{version}.tar.gz
|
|
Source0: ftp://alpha.gnu.org/gnu/grub/%{name}-%{version}.tar.gz
|
|
Source1: %{defshell}
|
|
Source1: %{defshell}
|
|
|
|
|
|
|
|
+# This is from
|
|
# http://git.kernel.org/?p=boot/grub-fedora/grub-fedora.git;a=summary
|
|
# http://git.kernel.org/?p=boot/grub-fedora/grub-fedora.git;a=summary
|
|
-Patch1: grub-fedora-15.patch
|
|
|
|
-
|
|
|
|
-#Patch10: grub-0.97-prototypes.patch
|
|
|
|
-#Patch100: ext3_256byte_inode.diff
|
|
|
|
-#Patch110: grub-0.97-ext4-support.patch
|
|
|
|
-#Patch120: grub-0.97-build-id=none.patch
|
|
|
|
-#Patch130: grub-0.97-tinfo.patch
|
|
|
|
|
|
+Patch0: grub-fedora-18.patch
|
|
|
|
+Patch1: 0001-Fix-strange-compilation-problem.patch
|
|
|
|
+Patch2: 0003-Move_network-disable-earlier.patch
|
|
|
|
+Patch3: 0005-Fix-Apple-CD-fixup.patch
|
|
|
|
+Patch4: 0006-Avoid-broken-uefi-fs.patch
|
|
|
|
+Patch5: 0007-fix-uefi-stride.patch
|
|
|
|
+Patch6: 0008-fix-gop.patch
|
|
|
|
+
|
|
|
|
+# for Vine
|
|
|
|
+Patch1000: grub-fedora-18-uninitialized.patch
|
|
|
|
+Patch1001: grub-fedora-18-static-efi.patch
|
|
|
|
+Patch1002: grub-0.97-grub-install-vine.patch
|
|
|
|
|
|
ExclusiveArch: %{ix86} x86_64
|
|
ExclusiveArch: %{ix86} x86_64
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
Requires(post): install-info, sed, grep, coreutils
|
|
Requires(post): install-info, sed, grep, coreutils
|
|
Requires(preun): install-info
|
|
Requires(preun): install-info
|
|
Requires: mktemp
|
|
Requires: mktemp
|
|
|
|
+Requires: util-linux
|
|
BuildRequires: ncurses-devel >= 5.6
|
|
BuildRequires: ncurses-devel >= 5.6
|
|
BuildRequires: glibc-static
|
|
BuildRequires: glibc-static
|
|
%ifarch x86_64
|
|
%ifarch x86_64
|
|
BuildRequires: compat32-glibc-devel
|
|
BuildRequires: compat32-glibc-devel
|
|
BuildRequires: compat32-glibc-static
|
|
BuildRequires: compat32-glibc-static
|
|
%endif
|
|
%endif
|
|
|
|
+%if %{efi_support}
|
|
|
|
+BuildRequires: gnu-efi >= 3.0e-9
|
|
|
|
+%endif
|
|
|
|
+BuildRequires: texinfo
|
|
|
|
|
|
%description
|
|
%description
|
|
GNU GRUB is a Multiboot boot loader.
|
|
GNU GRUB is a Multiboot boot loader.
|
|
@@ -64,23 +75,30 @@ GNU GRUB はマルチブートローダです。
|
|
作業を担当します。カーネルは、それを受けて、オペレーティング
|
|
作業を担当します。カーネルは、それを受けて、オペレーティング
|
|
システムの他の部分 (通常は GNU) を初期化します。
|
|
システムの他の部分 (通常は GNU) を初期化します。
|
|
|
|
|
|
|
|
+
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-%patch1 -p1 -b .fedora
|
|
|
|
-#%patch10 -p1 -b .prototypes
|
|
|
|
-#%patch100 -p1 -b .ext3_256byte_inode
|
|
|
|
-#%patch110 -p1 -b .ext4
|
|
|
|
-#%patch120 -p1 -b .build-id
|
|
|
|
-#%patch130 -p1 -b .ncurses5
|
|
|
|
|
|
+%patch0 -p1
|
|
|
|
+%patch1 -p1
|
|
|
|
+%patch2 -p1
|
|
|
|
+%patch3 -p1
|
|
|
|
+%patch4 -p1
|
|
|
|
+%patch5 -p1
|
|
|
|
+%patch6 -p1
|
|
|
|
+%patch1000 -p1
|
|
|
|
+%patch1001 -p1
|
|
|
|
+%patch1002 -p1
|
|
|
|
|
|
# Modify grub to show the full version number
|
|
# Modify grub to show the full version number
|
|
-sed -i 's/0\.97/%{version}-%{release}/' configure.in
|
|
|
|
|
|
+sed -i 's/0\.97/%{version}-%{release}/' configure.ac
|
|
|
|
|
|
%build
|
|
%build
|
|
-autoreconf
|
|
|
|
-autoconf
|
|
|
|
|
|
+autoreconf -if
|
|
GCCVERS=$(gcc --version | head -1 | cut -d\ -f3 | cut -d. -f1)
|
|
GCCVERS=$(gcc --version | head -1 | cut -d\ -f3 | cut -d. -f1)
|
|
-CFLAGS="-Os -g -fno-strict-aliasing -Wall -Werror -Wno-shadow -Wno-unused"
|
|
|
|
|
|
+# add "-fno-reorder-functions"
|
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=718722
|
|
|
|
+# https://bugs.launchpad.net/ubuntu/+source/grub/+bug/837815
|
|
|
|
+CFLAGS="-Os -g -fno-strict-aliasing -Wall -Werror -Wno-shadow -Wno-unused -fno-reorder-functions"
|
|
if [ "$GCCVERS" == "4" ]; then
|
|
if [ "$GCCVERS" == "4" ]; then
|
|
CFLAGS="$CFLAGS -Wno-pointer-sign"
|
|
CFLAGS="$CFLAGS -Wno-pointer-sign"
|
|
fi
|
|
fi
|
|
@@ -88,15 +106,18 @@ export CFLAGS
|
|
|
|
|
|
%if %{efi_support}
|
|
%if %{efi_support}
|
|
%configure --sbindir=/sbin \
|
|
%configure --sbindir=/sbin \
|
|
- --disable-auto-linux-mem-opt
|
|
|
|
|
|
+ --disable-auto-linux-mem-opt \
|
|
|
|
+ --datarootdir=%{_datadir} \
|
|
--with-platform=efi
|
|
--with-platform=efi
|
|
%__make
|
|
%__make
|
|
mv efi/grub.efi .
|
|
mv efi/grub.efi .
|
|
make clean
|
|
make clean
|
|
%endif
|
|
%endif
|
|
-
|
|
|
|
|
|
+autoreconf -if
|
|
CFLAGS="$CFLAGS -static"
|
|
CFLAGS="$CFLAGS -static"
|
|
|
|
+export CFLAGS
|
|
%configure --sbindir=/sbin \
|
|
%configure --sbindir=/sbin \
|
|
|
|
+ --datarootdir=%{_datadir} \
|
|
--disable-auto-linux-mem-opt
|
|
--disable-auto-linux-mem-opt
|
|
%__make
|
|
%__make
|
|
|
|
|
|
@@ -142,7 +163,7 @@ fi
|
|
%doc COPYING INSTALL README AUTHORS BUGS ChangeLog NEWS THANKS TODO MAINTENANCE
|
|
%doc COPYING INSTALL README AUTHORS BUGS ChangeLog NEWS THANKS TODO MAINTENANCE
|
|
/boot/grub
|
|
/boot/grub
|
|
%if %{efi_support}
|
|
%if %{efi_support}
|
|
-%attr(0755,root,root) /boot/efiu/EFI/vine
|
|
|
|
|
|
+%attr(0755,root,root) /boot/efi/EFI/vine
|
|
%endif
|
|
%endif
|
|
%{_syssbindir}/*
|
|
%{_syssbindir}/*
|
|
%{_sbindir}/*
|
|
%{_sbindir}/*
|
|
@@ -153,6 +174,17 @@ fi
|
|
%{_mandir}/man*/*
|
|
%{_mandir}/man*/*
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Aug 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.97-6
|
|
|
|
+- add Patch 2,3,4,5,6 from fedora
|
|
|
|
+- add Requires: util-linux
|
|
|
|
+- update Patch1002 (grub-0.97-grub-install-vine.patch)
|
|
|
|
+
|
|
|
|
+* Sun Jun 14 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.97-5
|
|
|
|
+- add BuildRequires: texinfo,gnu-efi
|
|
|
|
+- update Patch0 from fedora
|
|
|
|
+- add Patch1 from fedora
|
|
|
|
+- add Patch1000,1001,1002
|
|
|
|
+
|
|
* Fri May 27 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.97-4
|
|
* Fri May 27 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.97-4
|
|
- switch to grub-fedora.git to support new features (ext4/efi/...)
|
|
- switch to grub-fedora.git to support new features (ext4/efi/...)
|
|
|
|
|
|
@@ -187,13 +219,13 @@ fi
|
|
* Tue Sep 5 2006 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 0.97-0vl5
|
|
* Tue Sep 5 2006 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 0.97-0vl5
|
|
- add initrd in menu.lst file created by defaultmenu.sh
|
|
- add initrd in menu.lst file created by defaultmenu.sh
|
|
|
|
|
|
-* Thu Jun 26 2006 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 0.97-0vl4
|
|
|
|
|
|
+* Mon Jun 26 2006 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 0.97-0vl4
|
|
- fix date of previous changelog entry
|
|
- fix date of previous changelog entry
|
|
- escape macro of past changelog entries
|
|
- escape macro of past changelog entries
|
|
- change Source1: menu.lst.vine to defautmenu.sh
|
|
- change Source1: menu.lst.vine to defautmenu.sh
|
|
- invoke defaultmenu.sh on %%post scriptlet
|
|
- invoke defaultmenu.sh on %%post scriptlet
|
|
|
|
|
|
-* Thu Jun 21 2006 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 0.97-0vl3
|
|
|
|
|
|
+* Wed Jun 21 2006 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 0.97-0vl3
|
|
- remove Requires: ncurses, gpm, bash
|
|
- remove Requires: ncurses, gpm, bash
|
|
|
|
|
|
* Thu May 12 2005 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 0.97-0vl2
|
|
* Thu May 12 2005 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 0.97-0vl2
|