Verified Commit 580366b1 authored by Lorenzo "Palinuro" Faletra's avatar Lorenzo "Palinuro" Faletra
Browse files

Import Debian changes 2.04-15parrot1

grub2 (2.04-15parrot1) rolling; urgency=medium
.
  * Import new Debian release.
  * Add Parrot patches.
.
grub2 (2.04-15) unstable; urgency=medium
.
  * Demote grub-common → mtools dependency to Suggests, to go with xorriso;
    explain the situation in the package description (closes: #982313).
.
grub2 (2.04-14) unstable; urgency=medium
.
  [ Raphaël Hertzog ]
  * Extend grub-efi to also cover arm64/ia64/arm (closes: #981819).
.
  [ Colin Watson ]
  * Cherry-pick from upstream:
    - grub-install: Fix inverted test for NLS enabled when copying locales
      (closes: #979754).
  * Fix handling of trailing commas in grub-pc/install_devices (closes:
    #913928).
  * Make grub-firmware-qemu Recommend/Enhance qemu-system-x86, not qemu
    (closes: #966243).
  * Make grub-common depend on mtools on EFI platforms, for grub-mkrescue
    (closes: #774910).
.
grub2 (2.04-13) unstable; urgency=medium
.
  [ Steve McIntyre ]
  * Switch to using the efivarfs interface for detecting "system setup"
    (Closes: #979299)
parent c0224e14
Pipeline #2088 failed with stages
# see git-dpm(1) from git-dpm package
ecb767ebd71a5544ba82b2c4cc86855bab5655eb
ecb767ebd71a5544ba82b2c4cc86855bab5655eb
2bd6855d2e6a570ee3b68cbe46a2ab714e5dda0a
2bd6855d2e6a570ee3b68cbe46a2ab714e5dda0a
578bb115fbd47e1c464696f1f8d6183e5443975d
578bb115fbd47e1c464696f1f8d6183e5443975d
grub2_2.04.orig.tar.xz
......
grub2 (2.04-15parrot1) rolling; urgency=medium
* Import new Debian release.
* Add Parrot patches.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Thu, 25 Feb 2021 19:55:00 +0100
grub2 (2.04-15) unstable; urgency=medium
* Demote grub-common mtools dependency to Suggests, to go with xorriso;
explain the situation in the package description (closes: #982313).
-- Colin Watson <cjwatson@debian.org> Mon, 08 Feb 2021 21:39:24 +0000
grub2 (2.04-14) unstable; urgency=medium
[ Raphaël Hertzog ]
* Extend grub-efi to also cover arm64/ia64/arm (closes: #981819).
[ Colin Watson ]
* Cherry-pick from upstream:
- grub-install: Fix inverted test for NLS enabled when copying locales
(closes: #979754).
* Fix handling of trailing commas in grub-pc/install_devices (closes:
#913928).
* Make grub-firmware-qemu Recommend/Enhance qemu-system-x86, not qemu
(closes: #966243).
* Make grub-common depend on mtools on EFI platforms, for grub-mkrescue
(closes: #774910).
-- Colin Watson <cjwatson@debian.org> Sun, 07 Feb 2021 15:23:51 +0000
grub2 (2.04-13) unstable; urgency=medium
[ Steve McIntyre ]
* Switch to using the efivarfs interface for detecting "system setup"
(Closes: #979299)
-- Colin Watson <cjwatson@debian.org> Sat, 06 Feb 2021 17:30:38 +0000
grub2 (2.04-12parrot1) rolling-testing; urgency=medium
* Import new Debian release.
......
......@@ -2,7 +2,8 @@ Source: grub2
Section: admin
Priority: optional
XSBC-Original-Maintainer: GRUB Maintainers <pkg-grub-devel@alioth-lists.debian.net>
Maintainer: Kali Developers <devel@kali.org>
Maintainer: Parrot Dev Team <team@parrotsec.org>
Uploaders: Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>
Build-Depends: debhelper-compat (= 10),
patchutils,
python3,
......@@ -37,8 +38,8 @@ Build-Depends: debhelper-compat (= 10),
Build-Conflicts: autoconf2.13, libzfs-dev, libnvpair-dev
Standards-Version: 3.9.6
Homepage: https://www.gnu.org/software/grub/
Vcs-Git: https://gitlab.com/kalilinux/packages/grub2.git
Vcs-Browser: https://gitlab.com/kalilinux/packages/grub2
Vcs-Git: https://nest.parrotsec.org/packages/debian/grub2
Vcs-Browser: https://nest.parrotsec.org/packages/debian/grub2
Rules-Requires-Root: no
Package: grub2
......@@ -61,22 +62,20 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
This is a dummy transitional package that depends on grub-coreboot.
Package: grub-efi
Section: oldlibs
Architecture: any-i386 any-amd64
Architecture: any-i386 any-amd64 any-arm64 any-ia64 any-arm
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, grub-efi-ia32 (= ${binary:Version}) [any-i386], grub-efi-amd64 (= ${binary:Version}) [any-amd64]
Depends: ${misc:Depends}, grub-efi-ia32 (= ${binary:Version}) [any-i386], grub-efi-amd64 (= ${binary:Version}) [any-amd64], grub-efi-arm64 (= ${binary:Version}) [any-arm64], grub-efi-ia64 (= ${binary:Version}) [any-ia64], grub-efi-arm (= ${binary:Version}) [any-arm]
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (dummy package)
This is a dummy transitional package that depends on either grub-efi-ia32 or
grub-efi-amd64, depending on the architecture.
This is a dummy package that depends on the grub-efi-$ARCH package most likely
to be appropriate for each architecture.
Package: grub-common
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gettext-base, ${lsb-base-depends}
Replaces: grub-pc (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-efi (<< 1.99-1), grub-coreboot (<< 2.00-4), grub-linuxbios (<< 1.96+20080831-1), grub-efi-ia32 (<< 2.00-4), grub-efi-amd64 (<< 2.00-4), grub-efi-ia64 (<< 2.00-4), grub-yeeloong (<< 2.00-4), init-select
Recommends: os-prober (>= 1.33)
Suggests: multiboot-doc, grub-emu [any-i386 any-amd64 any-powerpc], xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
Suggests: multiboot-doc, grub-emu [any-i386 any-amd64 any-powerpc], mtools [any-i386 any-amd64 any-ia64 any-arm any-arm64], xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
Conflicts: init-select
# mdadm: See bugs #435983 and #455746
Breaks: mdadm (<< 2.6.7-2), lupin-support (<< 0.55), friendly-recovery (<< 0.2.13), apport (<< 2.1.1)
......@@ -85,6 +84,9 @@ Description: GRand Unified Bootloader (common files)
This package contains common files shared by the distinct flavours of GRUB.
It is shared between GRUB Legacy and GRUB 2, although a number of files
specific to GRUB 2 are here as long as they do not break GRUB Legacy.
.
grub-mkrescue needs the suggested packages mtools (for UEFI targets) and
xorriso.
Package: grub2-common
# Not Architecture: any because this package contains some things which are
......@@ -580,8 +582,8 @@ Description: GRand Unified Bootloader, version 2 (Open Firmware version)
Package: grub-firmware-qemu
Architecture: any-i386 any-amd64
Depends: ${misc:Depends}
Recommends: qemu
Enhances: qemu
Recommends: qemu-system-x86
Enhances: qemu-system-x86
Multi-Arch: foreign
Description: GRUB firmware image for QEMU
This package contains a binary of GRUB that has been built for use as
......
[DEFAULT]
pristine-tar = True
[pq]
patch-numbers = False
[dch]
multimaint-merge = True
From 2bd6855d2e6a570ee3b68cbe46a2ab714e5dda0a Mon Sep 17 00:00:00 2001
From: Martin Whitaker <fsf@martin-whitaker.me.uk>
Date: Mon, 25 May 2020 21:02:10 +0200
Subject: grub-install: Fix inverted test for NLS enabled when copying locales
Commit 3d8439da8 (grub-install: Locale depends on nls) 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>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=8451454889f3b46312cc16eb07970d6c20da0812
Last-Update: 2021-02-07
Patch-Name: grub-install-inverted-nls-test.patch
---
util/grub-install-common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
index 61f9075bc..1d47c33c0 100644
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -673,7 +673,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)
{
@@ -743,7 +743,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");
......@@ -98,4 +98,6 @@ grub-install-backup-and-restore.patch
tftp-roll-over-block-counter.patch
mdraid1x-linux-gcc-10.patch
zfs-gcc-10.patch
uefi-firmware-efivarfs.patch
grub-install-inverted-nls-test.patch
add-failsafe-boot-options.patch
From c65654e97ea4037c257267f3470d8ad296edd69b Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Tue, 5 Jan 2021 00:00:02 +0000
Subject: Switch to using the efivarfs interface for detecting "system setup"
The old efivarfs interface is deprecated and has been disabled in
newer Debian kernels.
Patch-Name: uefi-firmware-efivarfs.patch
---
util/grub.d/30_uefi-firmware.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
index 3c9f533d8..93ececffe 100644
--- a/util/grub.d/30_uefi-firmware.in
+++ b/util/grub.d/30_uefi-firmware.in
@@ -26,12 +26,12 @@ export TEXTDOMAINDIR="@localedir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
-efi_vars_dir=/sys/firmware/efi/vars
+efi_vars_dir=/sys/firmware/efi/efivars
EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
-OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"
+OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE"
if [ -e "$OsIndications" ] && \
- [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b1)") & 1 ))" = 1 ]; then
+ [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b5)") & 1 ))" = 1 ]; then
LABEL="System setup"
gettext_printf "Adding boot menu entry for EFI firmware configuration\n" >&2
......@@ -568,8 +568,8 @@ case "$1" in
db_go
db_get "$question"
failed_devices=
for i in `echo $RET | sed -e 's/, / /g'` ; do
real_device="$(readlink -f "$i")"
for i in $RET; do
real_device="$(readlink -f "${i%,}")"
if [ ! -e "$real_device" ]; then
echo "$real_device does not exist, so cannot grub-install to it!" >&2
failed_devices="$failed_devices $real_device"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment