diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2024-01-08 17:11:33 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-10 17:01:28 +0000 |
commit | 7fae6f3500b629f56ae68f4d62d696aa5c40350e (patch) | |
tree | 2eb3d95b2c36f4e8287f9415cbb05718f5982d0e /meta | |
parent | 5e1bc611d6255d07506eb736e6483a2b2c1773e5 (diff) | |
download | poky-7fae6f3500b629f56ae68f4d62d696aa5c40350e.tar.gz |
gptfdisk: Make the version consistent
The previous change [262aa17e0e popt: update 1.18 -> 1.19] backports a
patch [1] for gptfdisk and make the version bump from 1.0.9 to 1.0.9.1
and make the package version inconsistent as below:
root@qemux86-64:~# rpm -qa | grep gptfdisk
gptfdisk-1.0.9-r0.core2_64
root@qemux86-64:~# rpm -ql gptfdisk
/usr
/usr/sbin
/usr/sbin/cgdisk
/usr/sbin/fixparts
/usr/sbin/gdisk
/usr/sbin/sgdisk
root@qemux86-64:~# gdisk --help
GPT fdisk (gdisk) version 1.0.9.1
[snip]
So update the bumped version part to make the package version consistent.
[1] https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d
(From OE-Core rev: 8b43f06736321c3e9e6a9f418139058be4f2b355)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch index 218d9d6713..095d00b1e2 100644 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch +++ b/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001 | 1 | From e7f9c9909c27d6ceed5aa4ca17023a1bc94b620a Mon Sep 17 00:00:00 2001 |
2 | From: Rod Smith <rodsmith@rodsbooks.com> | 2 | From: Rod Smith <rodsmith@rodsbooks.com> |
3 | Date: Fri, 15 Apr 2022 18:10:14 -0400 | 3 | Date: Fri, 15 Apr 2022 18:10:14 -0400 |
4 | Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt | 4 | Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt |
@@ -6,11 +6,11 @@ Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt | |||
6 | 6 | ||
7 | Upstream-Status: Backport [https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/] | 7 | Upstream-Status: Backport [https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/] |
8 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 8 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
9 | --- | 10 | --- |
10 | NEWS | 8 ++++++++ | 11 | NEWS | 8 ++++++++ |
11 | gptcl.cc | 2 +- | 12 | gptcl.cc | 2 +- |
12 | support.h | 2 +- | 13 | 2 files changed, 9 insertions(+), 1 deletion(-) |
13 | 3 files changed, 10 insertions(+), 2 deletions(-) | ||
14 | 14 | ||
15 | diff --git a/NEWS b/NEWS | 15 | diff --git a/NEWS b/NEWS |
16 | index c7add56..9e153fd 100644 | 16 | index c7add56..9e153fd 100644 |
@@ -41,19 +41,6 @@ index 34c9421..0d578eb 100644 | |||
41 | poptResetContext(poptCon); | 41 | poptResetContext(poptCon); |
42 | 42 | ||
43 | if (device != NULL) { | 43 | if (device != NULL) { |
44 | diff --git a/support.h b/support.h | ||
45 | index 8ba9ad1..f91f1bc 100644 | ||
46 | --- a/support.h | ||
47 | +++ b/support.h | ||
48 | @@ -8,7 +8,7 @@ | ||
49 | #include <stdlib.h> | ||
50 | #include <string> | ||
51 | |||
52 | -#define GPTFDISK_VERSION "1.0.9" | ||
53 | +#define GPTFDISK_VERSION "1.0.9.1" | ||
54 | |||
55 | #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) | ||
56 | // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 | ||
57 | -- | 44 | -- |
58 | 2.30.2 | 45 | 2.35.5 |
59 | 46 | ||