From 08a5b9364d01ec56f9c785f0c9d8778ce43babb6 Mon Sep 17 00:00:00 2001 From: rluzuriaga Date: Fri, 24 Nov 2023 13:11:16 -0800 Subject: [PATCH] Removed gptfdisk from fos packages since buildroot already has the updated version. --- ...lly-revert-Tweaks-for-building-on-th.patch | 42 -------------- Buildroot/package/gptfdisk/Config.in | 52 ----------------- Buildroot/package/gptfdisk/gptfdisk.hash | 5 -- Buildroot/package/gptfdisk/gptfdisk.mk | 56 ------------------- 4 files changed, 155 deletions(-) delete mode 100644 Buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch delete mode 100644 Buildroot/package/gptfdisk/Config.in delete mode 100644 Buildroot/package/gptfdisk/gptfdisk.hash delete mode 100644 Buildroot/package/gptfdisk/gptfdisk.mk diff --git a/Buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch b/Buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch deleted file mode 100644 index 02f95453..00000000 --- a/Buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 22e69d77d745b42ca85fefdf8c9f7625b852b964 Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier -Date: Wed, 26 Feb 2020 22:08:28 +0100 -Subject: [PATCH] gptcurses: partially revert "Tweaks for building on the - latest XCode for macOS" - -This partially reverts commit bbd6b4cc67ffcdf7b2a6bd5008d28006cb147393. - -Fixes: - -| gptcurses.cc:29:10: fatal error: ncursesw/ncurses.h: No such file or directory -| 29 | #include -| | ^~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Pierre-Jean Texier -[Retrieved from: -https://sourceforge.net/u/texierp/gptfdisk/ci/22e69d77d745b42ca85fefdf8c9f7625b852b964 -Upstream status (with meson build system): -https://sourceforge.net/p/gptfdisk/code/merge-requests/21] ---- - gptcurses.cc | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/gptcurses.cc b/gptcurses.cc -index 1b18cf2..4ebfde1 100644 ---- a/gptcurses.cc -+++ b/gptcurses.cc -@@ -23,11 +23,7 @@ - #include - #include - #include --#if defined (__APPLE__) || (__FreeBSD__) - #include --#else --#include --#endif - #include "gptcurses.h" - #include "support.h" - --- -2.26.2 - diff --git a/Buildroot/package/gptfdisk/Config.in b/Buildroot/package/gptfdisk/Config.in deleted file mode 100644 index 3f8b9663..00000000 --- a/Buildroot/package/gptfdisk/Config.in +++ /dev/null @@ -1,52 +0,0 @@ -comment "gptfdisk needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GPTFDISK - bool "gptfdisk" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_GPTFDISK_GDISK if \ - !(BR2_PACKAGE_GPTFDISK_SGDISK || BR2_PACKAGE_GPTFDISK_CGDISK) - help - GPT fdisk (consisting of the gdisk and sgdisk programs) is a - text-mode partitioning tool that works on Globally Unique - Identifier (GUID) Partition Table (GPT) disks, rather than on - the more common (through 2010) Master Boot Record (MBR) - partition tables. - - http://www.rodsbooks.com/gdisk/ - -if BR2_PACKAGE_GPTFDISK - -config BR2_PACKAGE_GPTFDISK_GDISK - bool "interactive gdisk" - help - Install the interactive GUID partition table (GPT) manipulator - /usr/sbin/gdisk which is modelled after and quite similar in - use to the traditional MBR based fdisk tool. - -config BR2_PACKAGE_GPTFDISK_SGDISK - bool "command line sgdisk" - select BR2_PACKAGE_POPT - help - Install the command-line GUID partition table (GPT) - manipulator /usr/sbin/sgdisk which is named after the - traditional MBR based sfdisk tool albeit with an entirely - different option syntax. - -config BR2_PACKAGE_GPTFDISK_CGDISK - bool "ncurses cgdisk" - depends on BR2_USE_WCHAR # ncurses wchar - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16 - help - Install the ncurses-based GUID partition table (GPT) - manipulator /usr/sbin/cgdisk. - -config BR2_PACKAGE_GPTFDISK_FIXPARTS - bool "command line fixparts" - help - install the fixparts binaries. - -endif diff --git a/Buildroot/package/gptfdisk/gptfdisk.hash b/Buildroot/package/gptfdisk/gptfdisk.hash deleted file mode 100644 index caded358..00000000 --- a/Buildroot/package/gptfdisk/gptfdisk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.8/ -sha1 c8824e779056158fa32887e415f5399a8646c3c5 gptfdisk-1.0.8.tar.gz -# Locally computed -sha256 95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df gptfdisk-1.0.8.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/Buildroot/package/gptfdisk/gptfdisk.mk b/Buildroot/package/gptfdisk/gptfdisk.mk deleted file mode 100644 index 6db84ec8..00000000 --- a/Buildroot/package/gptfdisk/gptfdisk.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# gptfdisk -# -################################################################################ - -GPTFDISK_VERSION = 1.0.8 -GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk -GPTFDISK_LICENSE = GPL-2.0+ -GPTFDISK_LICENSE_FILES = COPYING - -GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk -GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk -GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk -GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_FIXPARTS) += fixparts - -GPTFDISK_DEPENDENCIES += util-linux -ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) -GPTFDISK_DEPENDENCIES += popt -endif -ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) -GPTFDISK_DEPENDENCIES += ncurses -endif - -ifeq ($(BR2_STATIC_LIBS),y) -# gptfdisk dependencies may link against libiconv, so we need to do so -# as well when linking statically -ifeq ($(BR2_PACKAGE_LIBICONV),y) -GPTFDISK_DEPENDENCIES += libiconv -GPTFDISK_LDLIBS += -liconv -endif -endif - -define GPTFDISK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - LDLIBS='$(GPTFDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) -endef - -define GPTFDISK_INSTALL_TARGET_CMDS - for i in $(GPTFDISK_TARGETS_y); do \ - $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i || exit 1; \ - done -endef - -HOST_GPTFDISK_DEPENDENCIES = host-util-linux host-popt - -define HOST_GPTFDISK_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) sgdisk -endef - -define HOST_GPTFDISK_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/sgdisk $(HOST_DIR)/sbin/sgdisk -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package))