Commit c950f75b authored by Lorenzo "Palinuro" Faletra's avatar Lorenzo "Palinuro" Faletra
Browse files

Import Debian changes 2.02+dfsg1-8parrot1

grub2 (2.02+dfsg1-8parrot1) testing; urgency=medium

  * Import new Debian release.

grub2 (2.02+dfsg1-8) unstable; urgency=medium

  * Revise grub-<platform>-bin and grub-<platform> package descriptions to
    try to explain better how they fit together and which one should be used
    (based loosely on work by Justin B Rye, for which thanks; closes:
    #630224).
  * Skip flaky grub_cmd_set_date test (closes: #906470).
  * Work around bug in obsolete init-select package: add Conflicts/Replaces
    from grub-common, and take over /etc/default/grub.d/init-select.cfg with
    a no-op stub (thanks to Guillem Jover for the suggestion; closes:
    #863801).
  * Build-depend on dosfstools and mtools on non-Linux variants of
    i386/amd64/arm64 as well, to match debian/rules.
  * Cherry-pick from upstream:
    - i386/linux: Add support for ext_lfb_base (LP: #1785033).
  * Don't source /etc/default/grub.d/*.cfg in config maintainer scripts,
    since otherwise we incorrectly merge settings from there into
    /etc/default/grub (closes: #872637, LP: #1797894).
  * Add xfs module to signed UEFI images (closes: #911147, LP: #1652822).
  * Cope with / being on a ZFS root dataset (closes: #886178).

  [ Debconf translations ]
  * [sv] Swedish (Martin Bagge and Anders Jonsson; closes: #851964).

grub2 (2.02+dfsg1-7) unstable; urgency=medium

  * Move kernel maintainer script snippets into grub2-common (thanks,
    Bastian Blank; closes: #910959).
  * Add cryptodisk and gcry_* modules to signed UEFI images (closes:
    #908162, LP: #1565950).
  * Remove dh_builddeb override to use xz compression; this has been the
    default since dpkg 1.17.0.
parent c5b3672a
# see git-dpm(1) from git-dpm package
02702bdfe14d8a04643a45b03715f734ae34dbac
02702bdfe14d8a04643a45b03715f734ae34dbac
b735acae310e78152bcc1633d179c74d13fbd841
b735acae310e78152bcc1633d179c74d13fbd841
59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
grub2_2.02+dfsg1.orig.tar.xz
......
......@@ -128,6 +128,7 @@ CD_MODULES="
test
true
video
xfs
zfs
zfscrypt
zfsinfo
......@@ -143,6 +144,29 @@ case $platform in
esac
GRUB_MODULES="$CD_MODULES
cryptodisk
gcry_arcfour
gcry_blowfish
gcry_camellia
gcry_cast5
gcry_crc
gcry_des
gcry_dsa
gcry_idea
gcry_md4
gcry_md5
gcry_rfc2268
gcry_rijndael
gcry_rmd160
gcry_rsa
gcry_seed
gcry_serpent
gcry_sha1
gcry_sha256
gcry_sha512
gcry_tiger
gcry_twofish
gcry_whirlpool
lvm
mdraid09
mdraid1x
......
grub2 (2.02+dfsg1-8parrot1) testing; urgency=medium
* Import new Debian release.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Sun, 11 Nov 2018 06:14:08 +0100
grub2 (2.02+dfsg1-8) unstable; urgency=medium
* Revise grub-<platform>-bin and grub-<platform> package descriptions to
try to explain better how they fit together and which one should be used
(based loosely on work by Justin B Rye, for which thanks; closes:
#630224).
* Skip flaky grub_cmd_set_date test (closes: #906470).
* Work around bug in obsolete init-select package: add Conflicts/Replaces
from grub-common, and take over /etc/default/grub.d/init-select.cfg with
a no-op stub (thanks to Guillem Jover for the suggestion; closes:
#863801).
* Build-depend on dosfstools and mtools on non-Linux variants of
i386/amd64/arm64 as well, to match debian/rules.
* Cherry-pick from upstream:
- i386/linux: Add support for ext_lfb_base (LP: #1785033).
* Don't source /etc/default/grub.d/*.cfg in config maintainer scripts,
since otherwise we incorrectly merge settings from there into
/etc/default/grub (closes: #872637, LP: #1797894).
* Add xfs module to signed UEFI images (closes: #911147, LP: #1652822).
* Cope with / being on a ZFS root dataset (closes: #886178).
[ Debconf translations ]
* [sv] Swedish (Martin Bagge and Anders Jonsson; closes: #851964).
-- Colin Watson <cjwatson@debian.org> Mon, 29 Oct 2018 13:02:08 +0000
grub2 (2.02+dfsg1-7) unstable; urgency=medium
* Move kernel maintainer script snippets into grub2-common (thanks,
Bastian Blank; closes: #910959).
* Add cryptodisk and gcry_* modules to signed UEFI images (closes:
#908162, LP: #1565950).
* Remove dh_builddeb override to use xz compression; this has been the
default since dpkg 1.17.0.
-- Colin Watson <cjwatson@debian.org> Sat, 27 Oct 2018 13:06:32 +0100
grub2 (2.02+dfsg1-6parrot1) testing; urgency=medium
* Import new Kali release to fix https://bugs.debian.org/908200
......@@ -221,7 +264,7 @@ grub2 (2.02~beta3-3) unstable; urgency=medium
* debian/control: Breaks shim (<< 0.9+1474479173.6c180c6-0ubuntu1~) due to
the renamed binaries in the new shim.
* debian/postinst.in: call on to update-secureboot-policy on configure to
make sure users can disable shim validation if necessary.
make sure users can disable shim validation if necessary.
* debian/build-efi-images: add loopback and squash4 modules to the signed
EFI images.
......@@ -1441,7 +1484,7 @@ grub2 (1.99-18) unstable; urgency=low
- Make FAT UUID uppercase to match Linux (LP: #948716).
[ Debconf translations ]
* Norwegian Bokmål (Hans Fredrik Nordhaug).
* Norwegian Bokmål (Hans Fredrik Nordhaug).
* Gujarati (Kartik Mistry). Closes: #663542
-- Colin Watson <cjwatson@debian.org> Mon, 19 Mar 2012 18:24:33 +0000
......@@ -1483,7 +1526,7 @@ grub2 (1.99-15) unstable; urgency=low
[ Debconf translations ]
* Dutch (Jeroen Schot). Closes: #651275
* Bulgarian (Damyan Ivanov). Closes: #653356
* Icelandic (Sveinn í Felli).
* Icelandic (Sveinn í Felli).
* Ukrainian (Yatsenko Alexandr). Closes: #654294
* Italian (Luca Monducci). Closes: #654304
* Thai (Theppitak Karoonboonyanan). Closes: #656551
......@@ -1494,7 +1537,7 @@ grub2 (1.99-15) unstable; urgency=low
* Polish (Michał Kułach). Closes: #657265
* Asturian (Mikel González).
* Dzongkha (Dawa Pemo)
* Tamil (Dr.T.Vasudevan).
* Tamil (Dr.T.Vasudevan).
* Belarusian (Viktar Siarhiejczyk). Closes: #662615
-- Colin Watson <cjwatson@debian.org> Mon, 05 Mar 2012 16:58:01 +0000
......@@ -2894,7 +2937,7 @@ grub2 (1.98~20091229-1) unstable; urgency=high
grub2 (1.98~20091222-1) unstable; urgency=low
* New Baazar snapshot.
- Make 30_os-prober again dash compatible. (Closes: #562034)
- Make 30_os-prober again dash compatible. (Closes: #562034)
-- Felix Zielcke <fzielcke@z-51.de> Tue, 22 Dec 2009 12:50:57 +0100
......@@ -2919,7 +2962,7 @@ grub2 (1.98~20091210-1) unstable; urgency=low
grub2 (1.97+20091210-1) unstable; urgency=low
* New Bazaar snapshot.
- patches/02_fix_mountpoints_in_mkrelpath.diff: Remove (merged).
- patches/02_fix_mountpoints_in_mkrelpath.diff: Remove (merged).
- Fixes FTBFS on powerpc (again) and sparc.
- patches/903_grub_legacy_0_based_partitions.diff: Resync (merged into
debian branch).
......@@ -3007,7 +3050,7 @@ grub2 (1.97+20091115-1) unstable; urgency=low
* patches/906_grub_extras.diff: Remove. Superseded by GRUB_CONTRIB variable
in recent upstream trunk.
* rules: Export GRUB_CONTRIB to enable grub-extras add-ons.
* Pass --force to grub-install in the postinst. (Closes: #553415)
* Pass --force to grub-install in the postinst. (Closes: #553415)
* Don't strip debug symbols from grub-emu. It's meant for debugging
and with them it's much more useful.
* Ship grub-mkfloppy in grub-pc.
......@@ -3250,7 +3293,7 @@ grub2 (1.96+20090808-1) unstable; urgency=low
also disable UUIDs on LVM over RAID.
* Add a debconf prompt to remove all grub2 files from /boot/grub on
purge. (Closes: #527068, #470400)
* Move the Suggests: os-prober from grub-pc to grub-common.
* Move the Suggests: os-prober from grub-pc to grub-common.
* patches/901_dpkg_version_comparison.diff: Updated.
* Update the Replaces on grub-common for the other packages to (<<
1.96+20080831-1). (Closes: #540492)
......@@ -3438,7 +3481,7 @@ grub2 (1.96+20090609-1) experimental; urgency=low
* Add kopensolaris-i386 to arch list.
[ Felix Zielcke ]
* Add a NEWS entry about the grub-efi split.
* Add a NEWS entry about the grub-efi split.
* Drop the build dependency on gcc-multilib for all *i386.
* Change upgrade-from-grub-legacy to use `dpkg-reconfigure grub-pc' to
install grub2 into MBR.
......@@ -4592,7 +4635,7 @@ grub2 (1.94-4) unstable; urgency=low
native building.
* Remove convert_kernel26 usage since it's not necessary anymore and due
initramfs-tools changes it's bug too.
[ Robert Millan ]
* Fork update-grub from grub legacy, and tweak a few commands in output to
make it work for grub2.
......@@ -4626,7 +4669,7 @@ grub2 (1.94-1) unstable; urgency=low
* New upstream release.
- Fix powerpc building. Closes: #370259
- 01_fix_grub-install.patch: merged upstream.
- Moved modules to /usr/lib/grub since they are architecture
- Moved modules to /usr/lib/grub since they are architecture
dependent.
* Leave CDBS set debhelper compatibility level.
* Allow amd64 build to happen. Closes: #364956
......@@ -4662,8 +4705,8 @@ grub2 (1.92-1) unstable; urgency=low
- Add support for Apple HFS+ filesystems.
* 01_fix_grub-install.patch: Added. Fix grub-install to use
/bin/grub-mkimage instead of /sbin/grub-mkimage. Closes: #338824
* Do not use CDBS tarball mode anymore. Closes: #344272
* Do not use CDBS tarball mode anymore. Closes: #344272
-- Otavio Salvador <otavio@debian.org> Thu, 5 Jan 2006 15:20:40 -0200
grub2 (1.91-0) unstable; urgency=low
......
......@@ -45,11 +45,12 @@ case @PACKAGE@ in
;;
esac
for x in /etc/default/grub /etc/default/grub.d/*.cfg ; do
if [ -e "$x" ]; then
. "$x"
fi
done
# This deliberately doesn't include /etc/default/grub.d/*.cfg, since we're
# only sourcing this configuration file in order to prompt for values to
# write back to /etc/default/grub.
if [ -e /etc/default/grub ]; then
. /etc/default/grub
fi
if [ "${GRUB_CMDLINE_LINUX+set}" = set ]; then
db_set grub2/linux_cmdline "$GRUB_CMDLINE_LINUX"
......
This diff is collapsed.
../../debian/apport/source_grub2.py usr/share/apport/package-hooks/
../../debian/grub.d etc
../../debian/init-select.cfg etc/default/grub.d
etc/bash_completion.d
etc/grub.d
......
../../debian/default usr/share/grub
../../debian/update-grub usr/sbin
../../debian/kernel/zz-update-grub etc/kernel/postinst.d
../../debian/kernel/zz-update-grub etc/kernel/postrm.d
usr/sbin/grub-install
usr/sbin/grub-reboot
......
# Work around a bug in the obsolete init-select package which broke
# grub-mkconfig when init-select was removed but not purged. This file does
# nothing and will be removed in a later release.
#
# See:
# https://bugs.debian.org/858528
# https://bugs.debian.org/863801
../../debian/kernel/zz-update-grub etc/kernel/postinst.d
../../debian/kernel/zz-update-grub etc/kernel/postrm.d
From 12cd97a08150a5ff9d0df7d03c8ec28f0961dc8e Mon Sep 17 00:00:00 2001
From: Arindam Nath <arindam.nath@amd.com>
Date: Thu, 12 Jul 2018 19:02:49 +0530
Subject: i386/linux: Add support for ext_lfb_base
The EFI Graphics Output Protocol can return a 64-bit
linear frame buffer address in some firmware/BIOS
implementations. We currently only store the lower
32-bits in the lfb_base. This will eventually be
passed to Linux kernel and the efifb driver will
incorrectly interpret the framebuffer address as
32-bit address.
The Linux kernel has already added support to handle
64-bit linear framebuffer address in the efifb driver
since quite some time now.
This patch adds the support for 64-bit linear frame
buffer address in GRUB to address the above mentioned
scenario.
Signed-off-by: Arindam Nath <arindam.nath@amd.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=886edba8770ccbc3def0af2a7d6b346d00d0af2f
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1785033
Last-Update: 2018-10-29
Patch-Name: add_ext_lfb_base_support.patch
---
grub-core/loader/i386/linux.c | 6 ++++++
include/grub/i386/linux.h | 6 +++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 59b88ca18..adffe589c 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -308,6 +308,12 @@ grub_linux_setup_video (struct linux_kernel_params *params)
params->lfb_line_len = mode_info.pitch;
params->lfb_base = (grub_size_t) framebuffer;
+
+#if defined (GRUB_MACHINE_EFI) && defined (__x86_64__)
+ params->ext_lfb_base = (grub_size_t) (((grub_uint64_t)(grub_size_t) framebuffer) >> 32);
+ params->capabilities |= VIDEO_CAPABILITY_64BIT_BASE;
+#endif
+
params->lfb_size = ALIGN_UP (params->lfb_line_len * params->lfb_height, 65536);
params->red_mask_size = mode_info.red_mask_size;
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index fc36bdaf3..008166a4a 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -43,6 +43,9 @@
#define GRUB_LINUX_CL_MAGIC 0xA33F
+#define VIDEO_CAPABILITY_SKIP_QUIRKS (1 << 0)
+#define VIDEO_CAPABILITY_64BIT_BASE (1 << 1) /* Frame buffer base is 64-bit. */
+
#ifdef __x86_64__
#define GRUB_LINUX_EFI_SIGNATURE \
@@ -189,8 +192,9 @@ struct linux_kernel_params
grub_uint16_t lfb_pages; /* 32 */
grub_uint16_t vesa_attrib; /* 34 */
grub_uint32_t capabilities; /* 36 */
+ grub_uint32_t ext_lfb_base; /* 3a */
- grub_uint8_t padding3[0x40 - 0x3a];
+ grub_uint8_t padding3[0x40 - 0x3e];
grub_uint16_t apm_version; /* 40 */
grub_uint16_t apm_code_segment; /* 42 */
......@@ -68,3 +68,6 @@ fix_lockdown.patch
tests-disable-sercon-in-seabios.patch
tests-fix-uhci-qemu-options.patch
R_X86_64_PLT32.patch
skip-grub_cmd_set_date.patch
add_ext_lfb_base_support.patch
zfs-root-dataset.patch
From 756b9b2aeb74618320652905bc366995ed84d683 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sun, 28 Oct 2018 19:45:56 +0000
Subject: Skip flaky grub_cmd_set_date test
Bug-Debian: https://bugs.debian.org/906470
Last-Update: 2018-10-28
Patch-Name: skip-grub_cmd_set_date.patch
---
tests/grub_cmd_set_date.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in
index c594ae3fc..0b62b9854 100644
--- a/tests/grub_cmd_set_date.in
+++ b/tests/grub_cmd_set_date.in
@@ -1,6 +1,9 @@
#! /bin/bash
set -e
+echo "Skipping flaky test."
+exit 77
+
. "@builddir@/grub-core/modinfo.sh"
case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
From b735acae310e78152bcc1633d179c74d13fbd841 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 29 Oct 2018 12:24:41 +0000
Subject: Cope with / being on a ZFS root dataset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If / is on the root dataset in a ZFS pool, then ${bootfs} will be set to
"/" (whereas if it is on a non-root dataset, there will be no trailing
slash). Passing "root=ZFS=${rpool}/" will fail to boot, but
"root=ZFS=${rpool}" works fine, so strip the trailing slash.
Fixes: https://savannah.gnu.org/bugs/?52746
Tested-by: Fejes József <jozsef.fejes@gmail.com>
Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Bug: https://savannah.gnu.org/bugs/?52746
Bug-Debian: https://bugs.debian.org/886178
Last-Update: 2018-10-29
Patch-Name: zfs-root-dataset.patch
---
util/grub.d/10_linux.in | 2 +-
util/grub.d/20_linux_xen.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 4cf321c54..024bd5c63 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -81,7 +81,7 @@ case x"$GRUB_FS" in
xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
- LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
+ LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}"
;;
esac
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index a4f9893b6..98ef163c1 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -77,7 +77,7 @@ case x"$GRUB_FS" in
xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
- LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
+ LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}"
;;
esac
# translation of grub2 debconf messages to Swedish
# Swedish translation for grub2.
# Copyright (C) 2007, 2008, 2009, 2010, 2014 Free Software Foundation, Inc.
# Copyright (C) 2007, 2008, 2009, 2010, 2014, 2017 Free Software Foundation, Inc.
# This file is distributed under the same license as the grub2 package.
#
# Daniel Nylander <po@danielnylander.se>, 2007.
# Martin Ågren <martin.agren@gmail.com>, 2008, 2009.
# Martin Bagge <brother@bsnet.se>, 2010, 2014
# Martin Bagge <brother@bsnet.se>, 2010, 2014, 2017
msgid ""
msgstr ""
"Project-Id-Version: grub2_sv\n"
"Report-Msgid-Bugs-To: grub2@packages.debian.org\n"
"POT-Creation-Date: 2017-01-20 00:29+0000\n"
"PO-Revision-Date: 2014-12-15 16:53+0100\n"
"PO-Revision-Date: 2017-01-21 15:16+0100\n"
"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
"Language: sv\n"
......@@ -19,7 +19,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.10\n"
"X-Generator: Poedit 1.8.11\n"
#. Type: boolean
#. Description
......@@ -97,8 +97,8 @@ msgid ""
"modules or grub.cfg."
msgstr ""
"Att köra grub-install automatiskt är rekommenderat i de flesta situationer "
"för att förhindra att den installerade GRUB-huvudavbildningen för att hamna "
"i ett förhållande där GRUB-moduler eller grub.cfg inte är i korrekt läge."
"för att förhindra den installerade GRUB-huvudavbildningen från att hamna i "
"ett förhållande där GRUB-moduler eller grub.cfg inte är i korrekt läge."
#. Type: multiselect
#. Description
......@@ -365,7 +365,7 @@ msgstr ""
#. Description
#: ../templates.in:4001
msgid "Update NVRAM variables to automatically boot into Debian?"
msgstr ""
msgstr "Uppdatera NVRAM-variabler för att automatiskt starta Debian?"
#. Type: boolean
#. Description
......@@ -377,6 +377,10 @@ msgid ""
"your NVRAM variables have been set up such that your system contacts a PXE "
"server on every boot, this would preserve that behavior."
msgstr ""
"Grub kan ställa in systemets NVRAM-variabler så att det kan starta Debian "
"automatiskt. Det kan tänkas att du inte vill ha detta läge aktivt och "
"undvika att ändra inställningarna för systemstart. Exempelvis om dina NVRAM-"
"variabler är satta till att systemet kontaktar en PXE-server vid varje start."
#. Type: string
#. Description
......
......@@ -514,7 +514,7 @@ override_dh_gencontrol:
TARNAME := grub2_$(deb_version)_$(DEB_HOST_ARCH).tar.gz
override_dh_builddeb:
dh_builddeb -- -Zxz
dh_builddeb
ifneq (,$(SB_PACKAGE))
echo $(deb_version) > obj/monolithic/$(SB_PACKAGE)/version
tar -c -f ../$(TARNAME) -a -C obj/monolithic/$(SB_PACKAGE) -v .
......
Supports Markdown
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