grub2 update
This commit is contained in:
Ertuğrul Erata
@@ -9,19 +9,19 @@ from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
WorkDir="grub-%s" % (get.srcVERSION().replace("_", "~"))
|
||||
#WorkDir="grub-%s" % (get.srcVERSION().replace("_", "~"))
|
||||
|
||||
|
||||
def setup():
|
||||
|
||||
shelltools.copy("../unifont*.bdf", "./unifont.bdf")
|
||||
shelltools.export("GRUB_CONTRIB", "%s/grub-%s/grub-extras" % (get.workDIR(), get.srcVERSION()))
|
||||
shelltools.export("GRUB_CONTRIB", "%s/grub-2.02/grub-extras" % (get.workDIR()))
|
||||
|
||||
pisitools.cflags.remove("-fstack-protector", "-fasynchronous-unwind-tables", "-fexceptions", "-fPIC")
|
||||
pisitools.cflags.sub("\s?(-O[\ds]|-D_FORTIFY_SOURCE=\d)\s?", " ")
|
||||
|
||||
#shelltools.system("./linguas.sh")
|
||||
shelltools.system("./autogen.sh")
|
||||
#shelltools.system("./autogen.sh")
|
||||
autotools.configure("--disable-werror \
|
||||
--with-grubdir=grub2 \
|
||||
--program-transform-name='s,grub,grub2,'\
|
||||
@@ -33,7 +33,7 @@ def setup():
|
||||
|
||||
shelltools.copytree("../grub-%s" % (get.srcVERSION().replace("_", "~")), "../grub-%s-efi" % get.srcVERSION())
|
||||
shelltools.cd("../grub-%s-efi" % get.srcVERSION())
|
||||
shelltools.system("./autogen.sh")
|
||||
#shelltools.system("./autogen.sh")
|
||||
autotools.configure("--disable-werror \
|
||||
--with-grubdir=grub2 \
|
||||
--program-transform-name='s,grub,grub2,'\
|
||||
@@ -50,6 +50,7 @@ def build():
|
||||
#make-dist for creating all updated translation files
|
||||
#autotools.make("dist")
|
||||
autotools.make()
|
||||
|
||||
shelltools.cd("../grub-%s-efi" % get.srcVERSION())
|
||||
autotools.make()
|
||||
shelltools.cd("..")
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From e2d5bf1bc6aaaabeba538c1ca94ea8601e4e1474 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Thu, 16 Oct 2014 23:43:51 -0400
|
||||
Subject: [PATCH] 10_linux: Default gfxpayload=keep only when booting using efi
|
||||
|
||||
vesafb seems to be unreliable when using BIOS compat mode.
|
||||
|
||||
---
|
||||
util/grub.d/10_linux.in | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
index d2e2a8f..a54b888 100644
|
||||
--- a/util/grub.d/10_linux.in
|
||||
+++ b/util/grub.d/10_linux.in
|
||||
@@ -104,7 +104,9 @@ linux_entry ()
|
||||
echo " load_video" | sed "s/^/$submenu_indentation/"
|
||||
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
|
||||
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
|
||||
- echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
||||
+ echo ' if [ "x$grub_platform" = xefi ]; then' | sed "s/^/$submenu_indentation/"
|
||||
+ echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
||||
+ echo ' fi' | sed "s/^/$submenu_indentation/"
|
||||
fi
|
||||
else
|
||||
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
|
||||
--
|
||||
2.7.2
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
From 43e3295aaad5278a1e53c5282e2660b72cd76d28 Mon Sep 17 00:00:00 2001
|
||||
From: "Robin H. Johnson" <robbat2@gentoo.org>
|
||||
Date: Tue, 29 Dec 2015 15:29:14 -0800
|
||||
Subject: [PATCH] GRUB_LINUX_KERNEL_GLOBS: configurable kernel selection
|
||||
|
||||
* util/grub.d/10_linux.in: Implement GRUB_LINUX_KERNEL_GLOBS
|
||||
* docs/grub.texi: Document GRUB_LINUX_KERNEL_GLOBS
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
---
|
||||
docs/grub.texi | 5 +++++
|
||||
util/grub.d/10_linux.in | 21 +++++++++++----------
|
||||
2 files changed, 16 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/docs/grub.texi b/docs/grub.texi
|
||||
index 9a25a0b..d1129ec 100644
|
||||
--- a/docs/grub.texi
|
||||
+++ b/docs/grub.texi
|
||||
@@ -1490,6 +1490,11 @@ This option may be set to a list of GRUB module names separated by spaces.
|
||||
Each module will be loaded as early as possible, at the start of
|
||||
@file{grub.cfg}.
|
||||
|
||||
+@item GRUB_LINUX_KERNEL_GLOBS
|
||||
+This option may be set to override the list of path globs used to find Linux
|
||||
+kernels. The defaults vary by architecture, and generally include both
|
||||
+@file{/boot} and @file{/}.
|
||||
+
|
||||
@end table
|
||||
|
||||
The following options are still accepted for compatibility with existing
|
||||
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
index 859b608..e5ac11d 100644
|
||||
--- a/util/grub.d/10_linux.in
|
||||
+++ b/util/grub.d/10_linux.in
|
||||
@@ -145,18 +145,19 @@ EOF
|
||||
}
|
||||
|
||||
machine=`uname -m`
|
||||
-case "x$machine" in
|
||||
+globs="$GRUB_LINUX_KERNEL_GLOBS"
|
||||
+[ -z "$globs" ] && case "x$machine" in
|
||||
xi?86 | xx86_64)
|
||||
- list=
|
||||
- for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
||||
- if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
|
||||
- done ;;
|
||||
- *)
|
||||
- list=
|
||||
- for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
||||
- if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
|
||||
- done ;;
|
||||
+ globs="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ globs="/boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-*"
|
||||
+ ;;
|
||||
esac
|
||||
+list=
|
||||
+for i in ${globs} ; do
|
||||
+ if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
|
||||
+done
|
||||
|
||||
case "$machine" in
|
||||
i?86) GENKERNEL_ARCH="x86" ;;
|
||||
--
|
||||
2.3.0
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>GNU GRUB is a Multiboot boot loader.</Summary>
|
||||
<Description>GNU GRUB (short for GNU GRand Unified Bootloader) is a boot loader package from the GNU Project.</Description>
|
||||
<Archive sha1sum="4f6f3719fd7dbb0449a58547c1b08c9801337663" type="tarxz">ftp://alpha.gnu.org/gnu/grub/grub-2.02~rc2.tar.xz</Archive>
|
||||
<Archive sha1sum="4ec712aced1c2b4cb6cd1cbd83fc2154249d6977" type="tarxz" target="grub-2.02~rc2/grub-extras">http://source.pisilinux.org/1.0/grub2_extras_915resolution_r10.tar.xz</Archive>
|
||||
<Archive sha1sum="3d7eb6eaab28b88cb969ba9ab24af959f4d1b178" type="tarxz">http://ftp.gnu.org/gnu/grub/grub-2.02.tar.xz</Archive>
|
||||
<Archive sha1sum="4ec712aced1c2b4cb6cd1cbd83fc2154249d6977" type="tarxz" target="grub-2.02/grub-extras">http://source.pisilinux.org/1.0/grub2_extras_915resolution_r10.tar.xz</Archive>
|
||||
<Archive sha1sum="30797ba7a86fc32213b9ae994c9fa45f37d01170" type="gz">http://ftp.gnu.org/gnu/unifont/unifont-6.3.20131217/unifont-6.3.20131217.bdf.gz</Archive>
|
||||
<Archive sha1sum="bc062965689314bcee544c34fe0b0afef847448d" type="tarxz" target="grub-2.02~rc2/themes">https://sourceforge.net/projects/pisilinux/files/source/grub2-theme-pisilinux-0.4.tar.xz</Archive>
|
||||
<Archive sha1sum="bc062965689314bcee544c34fe0b0afef847448d" type="tarxz" target="grub-2.02/themes">https://sourceforge.net/projects/pisilinux/files/source/grub2-theme-pisilinux-0.4.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>autogen</Dependency>
|
||||
<Dependency>binutils</Dependency>
|
||||
@@ -33,11 +33,17 @@
|
||||
<Dependency>device-mapper-devel</Dependency>
|
||||
<Dependency>gettext-devel</Dependency>
|
||||
<Dependency>noto-fonts</Dependency>
|
||||
<Dependency>efivar-devel</Dependency>
|
||||
<Dependency>efibootmgr-devel</Dependency>
|
||||
<Dependency>mtools</Dependency>
|
||||
<Dependency>dosfstools</Dependency>
|
||||
</BuildDependencies>
|
||||
<Replaces>
|
||||
<Package>grub</Package>
|
||||
</Replaces>
|
||||
<Patches>
|
||||
<Patch level="1">gfxpayload.patch</Patch>
|
||||
<Patch level="1">grub-2.02_beta2-KERNEL_GLOBS.patch</Patch>
|
||||
<Patch level="1">mkconfig-fix.patch</Patch>
|
||||
<Patch level="1">pisi_name_and_initramfs.patch</Patch>
|
||||
</Patches>
|
||||
@@ -79,6 +85,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2017-12-06</Date>
|
||||
<Version>2.02</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2017-06-19</Date>
|
||||
<Version>2.02_rc2</Version>
|
||||
|
||||
Reference in New Issue
Block a user