Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grub2-2.12

Browse Source
This commit is contained in:
Rmys
2024-04-24 13:25:05 +03:00
parent 743e0b562d
commit f84221d169
7 changed files with 99 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/boot/grub2/actions.py
+1 -1
View File
@@ -14,7 +14,7 @@ from pisi.actionsapi import shelltools
def setup():
shelltools.copy("../unifont*.bdf", "./unifont.bdf")
#shelltools.export("GRUB_CONTRIB", "%s/grub-2.06/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?", " ")
system/boot/grub2/files/b835601c.patch
+40
View File
@@ -0,0 +1,40 @@
From b835601c7639ed1890f2d3db91900a8506011a8e Mon Sep 17 00:00:00 2001
From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Date: Thu, 21 Dec 2023 01:17:35 -0600
Subject: build: Include grub-core/extra_deps.lst in dist
Fixes build failure due to the extra_deps.lst file not existing in the
tarball. Found while trying to package GRUB 2.12 for Gentoo.
make[3]: *** No rule to make target '/var/tmp/portage/sys-boot/grub-2.12/work/grub-2.12/grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop.
Fixes: 89fbe0cac (grub-core/Makefile.am: Make path to extra_deps.lst relative to $(top_srcdir)/grub-core)
Fixes: 154dcb1ae (build: Allow explicit module dependencies)
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
conf/Makefile.extra-dist | 1 +
1 file changed, 1 insertion(+)
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 5e7126f..d9e2b8c 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -21,6 +21,7 @@ EXTRA_DIST += conf/i386-cygwin-img-ld.sc
EXTRA_DIST += grub-core/Makefile.core.def
EXTRA_DIST += grub-core/Makefile.gcry.def
+EXTRA_DIST += grub-core/extra_deps.lst
EXTRA_DIST += grub-core/genmoddep.awk
EXTRA_DIST += grub-core/genmod.sh.in
EXTRA_DIST += grub-core/gensyminfo.sh.in
--
cgit v1.1
diff -Nuar a/grub-core/extra_deps.lst b/grub-core/extra_deps.lst
--- a/grub-core/extra_deps.lst 1970-01-01 02:00:00.000000000 +0200
+++ b/grub-core/extra_deps.lst 2023-12-22 18:07:36.000000000 +0300
@@ -0,0 +1 @@
+depends bli part_gpt
system/boot/grub2/files/grub-defaults
+1 -1
View File
@@ -45,7 +45,7 @@ GRUB_COLOR_HIGHLIGHT="black/white"
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
#GRUB_THEME="/path/to/gfxtheme"
#Possible locations
GRUB_THEME="/usr/share/grub/themes/Pisilinux2.4-Grub2-Themes-1/theme.txt"
GRUB_THEME="/usr/share/grub/themes/pisilinux/theme.txt"
#GRUB_THEME="/boot/grub/themes/Pisilinux-Bluez/theme.txt"
# Uncomment to get a beep at GRUB start
#GRUB_INIT_TUNE="480 440 1"
system/boot/grub2/files/mkconfig-fix.patch
+11 -10
View File
@@ -7,22 +7,24 @@ Subject: [PATCH] 00_header: add GRUB_COLOR_* variables
util/grub.d/00_header.in | 8 ++++++++
2 files changed, 10 insertions(+)
diff -Nuar a/util/grub-mkconfig.in b/util/grub-mkconfig.in
--- a/util/grub-mkconfig.in 2021-11-05 18:53:16.118969000 +0300
+++ b/util/grub-mkconfig.in 2021-11-05 20:03:25.603871159 +0300
@@ -243,6 +243,8 @@
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f8cbb8d7a..1189d95f9 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -246,6 +246,8 @@ export GRUB_DEFAULT \
GRUB_BACKGROUND \
GRUB_THEME \
GRUB_GFXPAYLOAD_LINUX \
+ GRUB_COLOR_NORMAL \
+ GRUB_COLOR_HIGHLIGHT \
GRUB_DISABLE_OS_PROBER \
GRUB_INIT_TUNE \
GRUB_SAVEDEFAULT \
diff -Nuar a/util/grub.d/00_header.in b/util/grub.d/00_header.in
--- a/util/grub.d/00_header.in 2021-11-05 18:53:15.816969000 +0300
+++ b/util/grub.d/00_header.in 2021-11-05 20:06:00.698859968 +0300
@@ -125,6 +125,14 @@
GRUB_ENABLE_CRYPTODISK \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 93a90233e..c5955df00 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,6 +125,14 @@ cat <<EOF
EOF
@@ -37,4 +39,3 @@ diff -Nuar a/util/grub.d/00_header.in b/util/grub.d/00_header.in
serial=0;
gfxterm=0;
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
system/boot/grub2/files/pisi_name_and_initramfs_2.patch
+29
View File
@@ -0,0 +1,29 @@
diff -Nuar a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
--- a/util/grub.d/10_linux.in 2022-12-07 16:47:11.000000000 +0300
+++ b/util/grub.d/10_linux.in 2023-12-23 13:55:45.671987034 +0300
@@ -29,7 +29,13 @@
CLASS="--class gnu-linux --class gnu --class os"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
- OS=GNU/Linux
+ if [ -f "/etc/pisilinux-release" ] ; then
+ OS="$(sed 's, release .*$,,g' /etc/pisilinux-release)"
+ elif [ -e "/etc/system-release" ] ; then
+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
+ else
+ OS=GNU/Linux
+ fi
else
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
@@ -223,7 +229,9 @@
done
initrd_real=
- for i in "initrd.img-${version}" "initrd-${version}.img" \
+ for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
+ "initrd-${version}" "initramfs-${version}.img" "initramfs-fallback-${version}.img"\
+ "initramfs-${version}.gz" "initramfs-${version}" \
"initrd-${alt_version}.img.old" "initrd-${version}.gz" \
"initrd-${alt_version}.gz.old" "initrd-${version}" \
"initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
system/boot/grub2/files/update-grub
-1
View File
@@ -1,3 +1,2 @@
#! /bin/sh
# export LC_ALL=C
grub2-mkconfig -o /boot/grub2/grub.cfg
system/boot/grub2/pspec.xml
+17 -11
View File
@@ -12,11 +12,9 @@
<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="c9f93f1e195ec7a5a21d36a13b469788c0b29f0f" type="tarxz">https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz</Archive>
<!-- <Archive sha1sum="4ec712aced1c2b4cb6cd1cbd83fc2154249d6977" type="tarxz" target="grub-2.06/grub-extras">https://sourceforge.net/projects/pisilinux/files/source/grub2_extras_915resolution_r10.tar.xz</Archive> -->
<Archive sha1sum="a1c085e822be3506371cef9e5bda3cb07551aa05" type="gz">https://ftp.gnu.org/gnu/unifont/unifont-15.1.04/unifont-15.1.04.bdf.gz</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="4dcd9fd1ddb33d3c83ceaf2a6c781c3371b55745" type="targz" target="grub-2.06/themes">https://github.com/erkanisik1/Pisilinux2.4-Grub2-Themes/archive/refs/tags/V1.tar.gz</Archive>
<Archive sha1sum="9a5cd9860a02d479ff65461b710a4d85ea46b9f4" type="tarxz">https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz</Archive>
<Archive sha1sum="cf7c7bab9a970e7153bd3a46c0cdf1d0dda4bf8a" type="gz">https://ftp.gnu.org/gnu/unifont/unifont-15.1.05/unifont-15.1.05.bdf.gz</Archive>
<Archive sha1sum="4dcd9fd1ddb33d3c83ceaf2a6c781c3371b55745" type="targz" target="grub-2.12/themes">https://github.com/erkanisik1/Pisilinux2.4-Grub2-Themes/archive/refs/tags/V1.tar.gz</Archive>
<BuildDependencies>
<Dependency>git</Dependency>
<Dependency>autogen-devel</Dependency>
@@ -44,12 +42,12 @@
<Package>grub</Package>
</Replaces>
<Patches>
<Patch level="1">mageia/0001-Fix-fgrep-grep-F-warnings.patch</Patch>
<!-- <Patch level="1">mageia/0001-Fix-fgrep-grep-F-warnings.patch</Patch> -->
<Patch level="1">gfxpayload.patch</Patch>
<Patch level="1">grub-2.02_beta2-KERNEL_GLOBS.patch</Patch>
<Patch level="1">grub-mkconfig.patch</Patch>
<Patch>pisi_name_and_initramfs.patch</Patch>
<Patch>pisi_name_and_initramfs_2.patch</Patch>
<Patch level="1">grub-2.06-test-words.patch</Patch>
<!-- <Patch level="1">grub-mkconfig_lib.patch</Patch> -->
@@ -57,12 +55,12 @@
<Patch level="1">0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch</Patch>
<Patch level="1">0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch</Patch>
<Patch level="1">0003-Revert-templates-Disable-the-os-prober-by-default.patch</Patch>
<Patch level="1">0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch</Patch>
<Patch level="1">0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch</Patch>
<!-- <Patch level="1">0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch</Patch> -->
<!-- <Patch level="1">0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch</Patch> -->
<!-- <Patch level="1">0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch</Patch> -->
<!-- <Patch level="1">0205-normal-main-Discover-the-device-to-read-the-config-f.patch</Patch> -->
<Patch level="1">0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch</Patch>
<Patch level="1">0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch</Patch>
<!-- <Patch level="1">0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch</Patch> -->
<!-- <Patch level="1">0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch</Patch> -->
<!-- <Patch level="1">0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch</Patch> -->
<!-- <Patch level="1">0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch</Patch> -->
<!-- <Patch level="1">0210-Print-module-name-on-license-check-failure.patch</Patch> -->
@@ -73,6 +71,7 @@
<!-- <Patch level="1">2.02-gcc8.patch</Patch> -->
<!-- <Patch level="1">0001-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch</Patch> -->
<!-- <Patch level="1">0006-BootHole.patch</Patch> -->
<Patch level="1">b835601c.patch</Patch>
</Patches>
</Source>
@@ -113,6 +112,13 @@
</Package>
<History>
<Update release="30">
<Date>2024-04-24</Date>
<Version>2.12</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="29">
<Date>2024-04-23</Date>
<Version>2.06</Version>