summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-04-19 18:31:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-20 13:13:59 +0100
commit2e269144c9f36a915bd967b33836aeb3da022d51 (patch)
treec397c1898d08c058dca7bdcc0d123a7d7622b246 /meta
parenta4df7ceead5532310a88b0f7b524b32c2dcb6a6b (diff)
downloadpoky-2e269144c9f36a915bd967b33836aeb3da022d51.tar.gz
gptfdisk: upgrade 1.0.8 -> 1.0.9
0001-gptcurses-correct-ncurses-6.3-errors.patch removed since it's included in 1.0.9. Changelog: =========== - Added support for aligning partitions' end points. This feature affects the default partition size when using n in gdisk; it affects the default partition size in cgdisk; and it's activated by the new -I option in sgdisk. See the programs' respective man pages for details. This feature is intended to help with LUKS2 encryption, which reacts badly to partitions that are not sized as exact multiples of the encryption block size. - Added several new partition type codes: FreeBSD nandfs (0xa506) Apple APFS Pre-Boot (0xaf0b) Apple APFS Recovery (0xaf0c) ChromeOS firmware (0x7f03) ChromeOS mini-OS (0x7f04) ChromeOS hibernate (0x7f05) U-Boot boot loader (0xb000) 27 (!) codes for Fuchsia (0xf100 to 0xf11a) - Added the ability to build sgdisk and cgdisk for Windows. - Added a check for too-small disks (most likely to be an issue when trying to use a too-small disk image); program now aborts if this happens. - Removed stray debugging code that caused partNum is x to be printed when changing a partition's name with sgdisk. - Fixed build problems with recent versions of ncurses. - Fixed bug that caused cgdisk to report incorrect partition attributes. (From OE-Core rev: a0e6ee2b34ae21764f8a5a649916488902016395) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correct-ncurses-6.3-errors.patch99
-rw-r--r--meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb (renamed from meta/recipes-devtools/fdisk/gptfdisk_1.0.8.bb)3
2 files changed, 1 insertions, 101 deletions
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correct-ncurses-6.3-errors.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correct-ncurses-6.3-errors.patch
deleted file mode 100644
index cbd1365080..0000000000
--- a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correct-ncurses-6.3-errors.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From e301f7dd650c9e56f954a7c49661d938079e1a9b Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 25 Oct 2021 17:27:51 +0200
4Subject: [PATCH] gptcurses: correct ncurses 6.3 errors
5
6Upstream-Status: Submitted [by email to rodsmith@rodsbooks.com]
7Signed-off-by: Alexander Kanavin <alex@linutronix.de>
8---
9 gptcurses.cc | 28 ++++++++++++++--------------
10 1 file changed, 14 insertions(+), 14 deletions(-)
11
12diff --git a/gptcurses.cc b/gptcurses.cc
13index d0de024..70be999 100644
14--- a/gptcurses.cc
15+++ b/gptcurses.cc
16@@ -235,22 +235,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) {
17 ClearLine(lineNum);
18 if (space->partNum == -1) { // space is empty
19 move(lineNum, 12);
20- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
21+ printw("%s",BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
22 move(lineNum, 24);
23- printw("free space");
24+ printw("%s","free space");
25 } else { // space holds a partition
26 move(lineNum, 3);
27 printw("%d", space->partNum + 1);
28 move(lineNum, 12);
29- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
30+ printw("%s",BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
31 move(lineNum, 24);
32- printw(space->origPart->GetTypeName().c_str());
33+ printw("%s",space->origPart->GetTypeName().c_str());
34 move(lineNum, 50);
35 #ifdef USE_UTF16
36 space->origPart->GetDescription().extract(0, 39, temp, 39);
37- printw(temp);
38+ printw("%s",temp);
39 #else
40- printw(space->origPart->GetDescription().c_str());
41+ printw("%s",space->origPart->GetDescription().c_str());
42 #endif
43 } // if/else
44 } // if
45@@ -267,10 +267,10 @@ int GPTDataCurses::DisplayParts(int selected) {
46
47 move(lineNum++, 0);
48 theLine = "Part. # Size Partition Type Partition Name";
49- printw(theLine.c_str());
50+ printw("%s",theLine.c_str());
51 move(lineNum++, 0);
52 theLine = "----------------------------------------------------------------";
53- printw(theLine.c_str());
54+ printw("%s",theLine.c_str());
55 numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM;
56 pageNum = selected / numToShow;
57 for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) {
58@@ -284,7 +284,7 @@ int GPTDataCurses::DisplayParts(int selected) {
59 } else {
60 currentSpace = ShowSpace(i, lineNum);
61 move(lineNum++, 0);
62- printw(">");
63+ printw("%s",">");
64 }
65 DisplayOptions(i);
66 retval = selected;
67@@ -632,7 +632,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) {
68 } // if/else
69 } // for
70 move(LINES - 1, (COLS - optionDesc.length()) / 2);
71- printw(optionDesc.c_str());
72+ printw("%s",optionDesc.c_str());
73 currentKey = selectedKey;
74 } // if
75 } // GPTDataCurses::DisplayOptions()
76@@ -744,11 +744,11 @@ void GPTDataCurses::DrawMenu(void) {
77
78 clear();
79 move(0, (COLS - title.length()) / 2);
80- printw(title.c_str());
81+ printw("%s",title.c_str());
82 move(2, (COLS - drive.length()) / 2);
83- printw(drive.c_str());
84+ printw("%s",drive.c_str());
85 move(3, (COLS - size.str().length()) / 2);
86- printw(size.str().c_str());
87+ printw("%s",size.str().c_str());
88 DisplayParts(currentSpaceNum);
89 } // DrawMenu
90
91@@ -798,7 +798,7 @@ void PromptToContinue(void) {
92 void Report(string theText) {
93 clear();
94 move(0, 0);
95- printw(theText.c_str());
96+ printw("%s", theText.c_str());
97 move(LINES - 2, (COLS - 29) / 2);
98 printw("Press any key to continue....");
99 cbreak();
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.8.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb
index 67b83b6ead..e473b9cd55 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.8.bb
+++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb
@@ -9,9 +9,8 @@ DEPENDS = "util-linux"
9 9
10SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ 10SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
11 file://0001-gptcurses-correctly-include-curses.h.patch \ 11 file://0001-gptcurses-correctly-include-curses.h.patch \
12 file://0001-gptcurses-correct-ncurses-6.3-errors.patch \
13 " 12 "
14SRC_URI[sha256sum] = "95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df" 13SRC_URI[sha256sum] = "dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2"
15 14
16UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" 15UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
17UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/" 16UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"