Skip to contentSkip to conversation

wic: remove gptfdisk dependency

PATCH In review Ross Burton 2 participants 4 messages Aug 11

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 wic: remove gptfdisk dependency

Originally, wic needed gptfdisk because it ran the sgdisk command. But wic has used sfdisk from util-linux (which is scriptable and supports GPT, two defining characteristics of sgdisk) since 2024[1] and no longer calls sgdisk (or any other commands from gptfdisk).

This commit has always been in the split-out wic, and was part of oe-core from walnascar onwards.

Remove the dependency on gptfdisk from the wic recipe and the test image wic-image-minimal.bb.

[1] wic 518dea0 ("wic: add WIC_SECTOR_SIZE variable")

wic-image-minimal: remove gptfdisk-native dependency

As with the previous commit, wic no longer calls gptdisk.

---
 meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 +-
 meta/recipes-support/wic/wic_0.3.1.bb                  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
meta-selftest/recipes-test/images/wic-image-minimal.bb +1 -1
index 89843d9b3ca..1c6455bb6be 100644
@@ -6,7 +6,7 @@ IMAGE_INSTALL = "packagegroup-core-boot"
 
 IMAGE_FSTYPES = "wic"
 
-WKS_FILE_DEPENDS = "dosfstools-native mtools-native gptfdisk-native"
+WKS_FILE_DEPENDS = "dosfstools-native mtools-native"
 WKS_FILE_DEPENDS:append:x86 = " syslinux-native syslinux"
 WKS_FILE_DEPENDS:append:x86-64 = " syslinux-native syslinux"
 WKS_FILE_DEPENDS:append:x86-x32 = " syslinux-native syslinux"
meta/recipes-support/wic/wic_0.3.1.bb +0 -1
index 116b0a2cd29..308389c183d 100644
@@ -16,7 +16,6 @@ RDEPENDS:${PN} += " \
     python3-logging \
     python3-misc \
     parted \
-    gptfdisk \
     dosfstools \
     mtools \
     bmaptool \
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/2 gptfdisk: remove recipe

There are no dependencies on this recipe in oe-core or meta-oe now, as the standard fdisk command in util-linux has both a scriptable frontend and supports GPT partition tables.

Also the last release was in 2024 and there's very little activity upstream.

As such, remove the recipe.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 ...gptcurses-correctly-include-curses.h.patch | 27 --------------
 .../recipes-devtools/fdisk/gptfdisk_1.0.10.bb | 35 -------------------
 3 files changed, 63 deletions(-)
 delete mode 100644 meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch
 delete mode 100644 meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb
meta/conf/distro/include/maintainers.inc +0 -1
index c5b701c2447..f30aa06e15d 100644
@@ -242,7 +242,6 @@ RECIPE_MAINTAINER:pn-go-runtime = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER:pn-gobject-introspection = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-gperf = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-gpgme = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER:pn-gptfdisk = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-graphene = "Markus Volk <[email protected]>"
 RECIPE_MAINTAINER:pn-grep = "Denys Dmytriyenko <[email protected]>"
 RECIPE_MAINTAINER:pn-groff = "Hongxu Jia <[email protected]>"
meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch deleted +0 -27
deleted file mode 100644
index 011eec36f98..00000000000
@@ -1,27 +0,0 @@
-From 510d0d27f90dfb1c4afd0722580bb8a828b52b7f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 30 Mar 2020 17:11:19 +0200
-Subject: [PATCH] gptcurses: correctly include curses.h
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- gptcurses.cc | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/gptcurses.cc b/gptcurses.cc
-index b476700..476fc43 100644
---- a/gptcurses.cc
-+++ b/gptcurses.cc
-@@ -23,11 +23,7 @@
- #include <iostream>
- #include <string>
- #include <sstream>
--#if defined (__APPLE__) || (__FreeBSD__)
- #include <ncurses.h>
--#else
--#include <ncursesw/ncurses.h>
--#endif
- #include "gptcurses.h"
- #include "support.h"
- 
meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb deleted +0 -35
deleted file mode 100644
index ba891931aca..00000000000
@@ -1,35 +0,0 @@
-SUMMARY = "Utility for modifying GPT disk partitioning"
-DESCRIPTION = "GPT fdisk is a disk partitioning tool loosely modeled on Linux fdisk, but used for modifying GUID Partition Table (GPT) disks. The related FixParts utility fixes some common problems on Master Boot Record (MBR) disks."
-HOMEPAGE = "https://sourceforge.net/projects/gptfdisk/"
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-DEPENDS = "util-linux"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
-           file://0001-gptcurses-correctly-include-curses.h.patch \
-           "
-SRC_URI[sha256sum] = "2abed61bc6d2b9ec498973c0440b8b804b7a72d7144069b5a9209b2ad693a282"
-
-UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
-UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"
-
-EXTRA_OEMAKE = "'CC=${CC}' 'CXX=${CXX}' gdisk fixparts ${PACKAGECONFIG_CONFARGS}"
-
-PACKAGECONFIG ??= "ncurses popt"
-PACKAGECONFIG[ncurses] = "cgdisk,,ncurses"
-PACKAGECONFIG[popt] = "sgdisk,,popt"
-
-do_install() {
-    install -d ${D}${sbindir}
-    for f in cgdisk sgdisk; do
-        if [ -x $f ]; then
-            install -m 0755 $f ${D}${sbindir}
-        fi
-    done
-    install -m 0755 gdisk ${D}${sbindir}
-    install -m 0755 fixparts ${D}${sbindir}
-}
-
-BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.43.0
#2 lore raw

Re: [OE-core] [PATCH 2/2] gptfdisk: remove recipe

Quoted 9 lines · Ross Burton via lists.openembedded.org

There are no dependencies on this recipe in oe-core or meta-oe now, as the standard fdisk command in util-linux has both a scriptable frontend and supports GPT partition tables.

Also the last release was in 2024 and there's very little activity upstream.

As such, remove the recipe.

And break the build :)

Looks like we do have a dependency on gptfdisk-native. Maybe this match in meta-yocto?

meta-yocto-bsp/conf/machine/include/genericx86-common.inc:do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot"

Here is the error:
ERROR: Nothing PROVIDES 'gptfdisk-native'. Close matches:
gperf-native
gtk+3-native
gtk4-native
ERROR: Nothing RPROVIDES 'core-image-sato'
No eligible RPROVIDERs exist for 'core-image-sato'
NOTE: Runtime target 'core-image-sato' is unbuildable, removing... Missing or unbuildable dependency chain was: ['core-image-sato']
ERROR: Nothing RPROVIDES 'core-image-sato-sdk'
No eligible RPROVIDERs exist for 'core-image-sato-sdk'
NOTE: Runtime target 'core-image-sato-sdk' is unbuildable, removing... Missing or unbuildable dependency chain was: ['core-image-sato-sdk']
ERROR: Nothing RPROVIDES 'core-image-minimal'
No eligible RPROVIDERs exist for 'core-image-minimal'
NOTE: Runtime target 'core-image-minimal' is unbuildable, removing... Missing or unbuildable dependency chain was: ['core-image-minimal']
ERROR: Nothing RPROVIDES 'core-image-full-cmdline'
No eligible RPROVIDERs exist for 'core-image-full-cmdline'
NOTE: Runtime target 'core-image-full-cmdline' is unbuildable, removing... Missing or unbuildable dependency chain was: ['core-image-full-cmdline']

https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/4388
https://autobuilder.yoctoproject.org/valkyrie/#/builders/19/builds/4362
https://autobuilder.yoctoproject.org/valkyrie/#/builders/65/builds/4336
...

Thanks,
Mathieu

Signature · 3 lines
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

Re: [OE-core] [PATCH 2/2] gptfdisk: remove recipe

Quoted 6 lines · Mathieu Dubois-Briand
Quoted 1 line

As such, remove the recipe.

And break the build :)

Looks like we do have a dependency on gptfdisk-native. Maybe this match in meta-yocto?

Sorry, I didn’t notice that one, patch just sent to poky@.

Ross