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

grub2-2.04 ver. bump

Browse Source
This commit is contained in:
Rmys
2020-03-28 21:44:34 +03:00
parent bfdf5fc6b5
commit ca78ac8fcd
2 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/boot/grub2/files/0001-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch
+36
View File
@@ -0,0 +1,36 @@
From ee855b15ff185bad3b0495500ab234b9cab7436c Mon Sep 17 00:00:00 2001
From: Martin Whitaker <fsf@martin-whitaker.me.uk>
Date: Mon, 24 Feb 2020 22:11:29 +0000
Subject: [PATCH] grub-install: fix inverted test for NLS enabled when copying
locales.
Commit 3d8439da8c9a4acf9bc1c41b364ec6e1680ef052 attempted to avoid
copying locale files to the target directory when NLS was disabled.
However the test is inverted, and it does the opposite.
Signed-off-by: Martin Whitaker <fsf@martin-whitaker.me.uk>
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
index ca0ac612a..f53bf0694 100644
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -598,7 +598,7 @@ copy_all (const char *srcd,
grub_util_fd_closedir (d);
}
-#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
+#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
static const char *
get_localedir (void)
{
@@ -659,7 +659,7 @@ static void
grub_install_copy_nls(const char *src __attribute__ ((unused)),
const char *dst __attribute__ ((unused)))
{
-#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
+#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
char *dst_locale;
dst_locale = grub_util_path_concat (2, dst, "locale");
--
2.21.1
system/boot/grub2/pspec.xml
+15 -7
View File
@@ -12,11 +12,11 @@
<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="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="3ed21de7be5970d7638b9f526bca3292af78e0fc" type="tarxz">http://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz</Archive>
<Archive sha1sum="4ec712aced1c2b4cb6cd1cbd83fc2154249d6977" type="tarxz" target="grub-2.04/grub-extras">http://source.pisilinux.org/1.0/grub2_extras_915resolution_r10.tar.xz</Archive>
<Archive sha1sum="78ca20098af935ce3e2a5232a2d2d00e6aa54542" type="gz">https://ftp.gnu.org/gnu/unifont/unifont-12.1.03/unifont_jp-12.1.03.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="91b6280aa62f1e04e6e147023e130b528416ac99" type="targz" target="grub-2.02/themes">https://github.com/sebo28/Pisilinux-Bluez/archive/v0.1.tar.gz</Archive>
<Archive sha1sum="91b6280aa62f1e04e6e147023e130b528416ac99" type="targz" target="grub-2.04/themes">https://github.com/sebo28/Pisilinux-Bluez/archive/v0.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>autogen</Dependency>
<Dependency>binutils</Dependency>
@@ -47,10 +47,11 @@
<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>
<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>
<Patch level="1">2.02-gcc8.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> -->
<!-- <Patch level="1">2.02-gcc8.patch</Patch> -->
<Patch level="1">0001-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch</Patch>
</Patches>
</Source>
@@ -90,6 +91,13 @@
</Package>
<History>
<Update release="16">
<Date>2020-03-28</Date>
<Version>2.04</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="15">
<Date>2020-01-18</Date>
<Version>2.02</Version>