grub2 rebuild
This commit is contained in:
Rmys
GitHub
@@ -15,7 +15,7 @@ from pisi.actionsapi import shelltools
|
||||
def setup():
|
||||
|
||||
shelltools.copy("../unifont*.bdf", "./unifont.bdf")
|
||||
shelltools.export("GRUB_CONTRIB", "%s/grub-2.04/grub-extras" % (get.workDIR()))
|
||||
shelltools.export("GRUB_CONTRIB", "%s/grub-2.06/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?", " ")
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From 0f5080a2f3c952e2ee00bd271f42c56bb955dc19 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Sun, 14 Mar 2021 12:44:52 -0400
|
||||
Subject: [PATCH] Use /usr/share/dict/words as a 'compressible' file
|
||||
|
||||
---
|
||||
tests/util/grub-fs-tester.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
|
||||
index bfc425e1f..efd2977b0 100644
|
||||
--- a/tests/util/grub-fs-tester.in
|
||||
+++ b/tests/util/grub-fs-tester.in
|
||||
@@ -265,7 +265,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
|
||||
MASTER="${tempdir}/master"
|
||||
FSLABEL="grub_;/testé莭莽茝😁киритi urewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewrewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfew"
|
||||
CFILESRC=
|
||||
- for cand in /usr/share/dict/american-english /usr/share/dict/linux.words /data/data/com.termux/files/usr/share/hunspell/en_US.dic; do
|
||||
+ for cand in /usr/share/dict/words; do
|
||||
if test -f "$cand" ; then
|
||||
CFILESRC="$cand"
|
||||
break
|
||||
--
|
||||
2.31.0.rc1
|
||||
|
||||
@@ -51,3 +51,5 @@ GRUB_THEME="/usr/share/grub/themes/pisilinux/theme.txt"
|
||||
#GRUB_INIT_TUNE="480 440 1"
|
||||
|
||||
#GRUB_SAVEDEFAULT="true"
|
||||
|
||||
GRUB_DISABLE_OS_PROBER="false"
|
||||
|
||||
@@ -1,21 +1,30 @@
|
||||
From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Wed, 10 Mar 2021 18:42:25 +0100
|
||||
Subject: [PATCH] 00_header: add GRUB_COLOR_* variables
|
||||
---
|
||||
util/grub-mkconfig.in | 2 ++
|
||||
util/grub.d/00_header.in | 8 ++++++++
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||
index 516be86..5f37db2 100644
|
||||
index f8cbb8d7a..1189d95f9 100644
|
||||
--- a/util/grub-mkconfig.in
|
||||
+++ b/util/grub-mkconfig.in
|
||||
@@ -213,6 +213,8 @@ export GRUB_DEFAULT \
|
||||
@@ -246,6 +246,8 @@ export GRUB_DEFAULT \
|
||||
GRUB_BACKGROUND \
|
||||
GRUB_THEME \
|
||||
GRUB_GFXPAYLOAD_LINUX \
|
||||
GRUB_DISABLE_OS_PROBER \
|
||||
+ GRUB_COLOR_NORMAL \
|
||||
+ GRUB_COLOR_HIGHLIGHT \
|
||||
GRUB_INIT_TUNE \
|
||||
GRUB_SAVEDEFAULT \
|
||||
GRUB_ENABLE_CRYPTODISK \
|
||||
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
||||
index 765bfdc..b148558 100644
|
||||
index 93a90233e..c5955df00 100644
|
||||
--- a/util/grub.d/00_header.in
|
||||
+++ b/util/grub.d/00_header.in
|
||||
@@ -115,6 +115,14 @@ cat <<EOF
|
||||
@@ -125,6 +125,14 @@ cat <<EOF
|
||||
|
||||
EOF
|
||||
|
||||
@@ -29,4 +38,4 @@ index 765bfdc..b148558 100644
|
||||
+
|
||||
serial=0;
|
||||
gfxterm=0;
|
||||
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
|
||||
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
#! /bin/sh
|
||||
LC_ALL=C
|
||||
grub2-mkconfig -o /boot/grub2/grub.cfg
|
||||
|
||||
@@ -45,8 +45,10 @@
|
||||
<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">mkconfig-fix.patch</Patch>
|
||||
<Patch level="1">pisi_name_and_initramfs.patch</Patch>
|
||||
|
||||
<Patch level="1">grub-2.06-test-words.patch</Patch>
|
||||
<!-- <Patch level="1">Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch</Patch> -->
|
||||
<!-- <Patch level="1">tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch</Patch> -->
|
||||
<!-- <Patch level="1">intel-ucode.patch</Patch> -->
|
||||
|
||||
Reference in New Issue
Block a user