diff options
Diffstat (limited to 'meta/recipes-devtools/fdisk')
| -rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb (renamed from meta/recipes-devtools/fdisk/gptfdisk_1.0.3.bb) | 25 |
2 files changed, 44 insertions, 8 deletions
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch new file mode 100644 index 0000000000..011eec36f9 --- /dev/null +++ b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch @@ -0,0 +1,27 @@ +From 510d0d27f90dfb1c4afd0722580bb8a828b52b7f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +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 <alex.kanavin@gmail.com> +--- + 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" + diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.3.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb index 4d617e3e46..ba891931ac 100644 --- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.3.bb +++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb @@ -1,25 +1,34 @@ 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 = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "util-linux popt ncurses" +DEPENDS = "util-linux" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "07b625a583b66c8c5840be5923f3e3fe" -SRC_URI[sha256sum] = "89fd5aec35c409d610a36cb49c65b442058565ed84042f767bba614b8fc91b5c" +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}'" +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} - install -m 0755 cgdisk ${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 sgdisk ${D}${sbindir} install -m 0755 fixparts ${D}${sbindir} } |