CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

gptfdisk: Make the version consistent

Browse Source 
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] 5d5e76d369

(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>
This commit is contained in:
Mingli Yu 2024-01-08 17:11:33 +08:00 committed by Richard Purdie
parent 5e1bc611d6
commit 7fae6f3500
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch
View File

@ -1,4 +1,4 @@
From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001
From e7f9c9909c27d6ceed5aa4ca17023a1bc94b620a Mon Sep 17 00:00:00 2001
From: Rod Smith <rodsmith@rodsbooks.com>
Date: Fri, 15 Apr 2022 18:10:14 -0400
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
Upstream-Status: Backport [https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
NEWS | 8 ++++++++
gptcl.cc | 2 +-
support.h | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
NEWS | 8 ++++++++
gptcl.cc | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index c7add56..9e153fd 100644
@ -41,19 +41,6 @@ index 34c9421..0d578eb 100644
poptResetContext(poptCon);
if (device != NULL) {
diff --git a/support.h b/support.h
index 8ba9ad1..f91f1bc 100644
--- a/support.h
+++ b/support.h
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include <string>
-#define GPTFDISK_VERSION "1.0.9"
+#define GPTFDISK_VERSION "1.0.9.1"
#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
// Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
--
2.30.2
2.35.5