Package: util-linux
Version: 2.36.1-8
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu impish ubuntu-patch
Dear Maintainer,
* What led up to the situation?
ubuntu@ubuntu:~$ sudo fdisk -l
Disk /dev/mmcblk0: 29.72 GiB, 31914983424 bytes, 62333952 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: gpt
Disk identifier: 892D1327-1A07-4589-A149-ED0F3B603575
Device Start End Sectors Size Type
/dev/mmcblk0p1 235554 62333918 62098365 29.6G Linux filesystem
/dev/mmcblk0p12 227362 235553 8192 4M Linux filesystem
/dev/mmcblk0p13 34 2081 2048 1M HiFive Unleashed FSBL
/dev/mmcblk0p14 2082 10273 8192 4M HiFive Unleashed BBL
/dev/mmcblk0p15 10274 227361 217088 106M EFI System
* What exactly did you do (or not do) that was effective (or
ineffective)?
Please see https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1944741.
Thanks for considering the attached patch.
-- System Information:
Debian Release: bullseye/sid
APT prefers hirsute-updates
APT policy: (500, 'hirsute-updates'), (500, 'hirsute-security'), (500,
'hirsute'), (100, 'hirsute-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.11.0-31-generic (SMP w/16 CPU threads)
Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru util-linux-2.36.1/debian/control util-linux-2.36.1/debian/control
--- util-linux-2.36.1/debian/control 2021-08-11 23:37:09.000000000 +0200
+++ util-linux-2.36.1/debian/control 2021-09-23 16:07:01.000000000 +0200
@@ -23,8 +23,7 @@
Build-Conflicts: libcryptsetup-dev
Section: base
Priority: required
-Maintainer: Ubuntu Developers <[email protected]>
-XSBC-Original-Maintainer: util-linux packagers <[email protected]>
+Maintainer: util-linux packagers <[email protected]>
Uploaders: Chris Hofstaedtler <[email protected]>
Standards-Version: 4.5.1
Rules-Requires-Root: binary-targets
diff -Nru util-linux-2.36.1/debian/patches/hifive-guid-names.patch
util-linux-2.36.1/debian/patches/hifive-guid-names.patch
--- util-linux-2.36.1/debian/patches/hifive-guid-names.patch 1970-01-01
01:00:00.000000000 +0100
+++ util-linux-2.36.1/debian/patches/hifive-guid-names.patch 2021-09-23
16:06:46.000000000 +0200
@@ -0,0 +1,25 @@
+Description: Rename HiFive partition UUIDs
+Both HiFive Unleashed and HiFive Unmatched bootloaders seek for the same
+UUIDs to load the next stage bootloader: the current name makes partitions
+on Unmatched board appear as 'Unleashed'.
+
+Fix that by removing the 'Unleashed' part of the current name so that it
+fits both.
+Author: Alexandre Ghiti <[email protected]>
+Origin: upstream,
https://github.com/karelzak/util-linux/commit/10fd91d389497d8be435cc66abbdeb2eb6ea2f07
+Applied-Upstream:
https://github.com/karelzak/util-linux/commit/10fd91d389497d8be435cc66abbdeb2eb6ea2f07
+Last-Update: 2021-09-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/include/pt-gpt-partnames.h
++++ b/include/pt-gpt-partnames.h
+@@ -165,6 +165,6 @@
+ /* Plan 9 */
+ DEF_GUID("C91818F9-8025-47AF-89D2-F030D7000C2C", N_("Plan 9 partition")),
+
+-/* HiFive Unleased bootloaders */
+-DEF_GUID("5B193300-FC78-40CD-8002-E86C45580B47", N_("HiFive Unleashed FSBL")),
+-DEF_GUID("2E54B353-1271-4842-806F-E436D6AF6985", N_("HiFive Unleashed BBL")),
++/* HiFive bootloaders */
++DEF_GUID("5B193300-FC78-40CD-8002-E86C45580B47", N_("HiFive FSBL")),
++DEF_GUID("2E54B353-1271-4842-806F-E436D6AF6985", N_("HiFive BBL")),
diff -Nru util-linux-2.36.1/debian/patches/series
util-linux-2.36.1/debian/patches/series
--- util-linux-2.36.1/debian/patches/series 2021-08-11 23:42:55.000000000
+0200
+++ util-linux-2.36.1/debian/patches/series 2021-09-23 16:02:06.000000000
+0200
@@ -9,3 +9,4 @@
upstream/libmount-do-not-canonicalize-ZFS-source-dataset.patch
upstream/libmount-allow-read-only-for-not-root-users.patch
upstream/CVE-2021-37600-sys-utils-ipcutils-be-careful-when-call-calloc.patch
+hifive-guid-names.patch
