generated from gaoyang3513/SDK_RK3288
[Mod] First commit
This commit is contained in:
@ -0,0 +1,42 @@
|
||||
From 22e69d77d745b42ca85fefdf8c9f7625b852b964 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Jean Texier <pjtexier@koncepto.io>
|
||||
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 <ncursesw/ncurses.h>
|
||||
| | ^~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
|
||||
[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 <iostream>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
-#if defined (__APPLE__) || (__FreeBSD__)
|
||||
#include <ncurses.h>
|
||||
-#else
|
||||
-#include <ncursesw/ncurses.h>
|
||||
-#endif
|
||||
#include "gptcurses.h"
|
||||
#include "support.h"
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
47
package/gptfdisk/Config.in
Normal file
47
package/gptfdisk/Config.in
Normal file
@ -0,0 +1,47 @@
|
||||
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.
|
||||
|
||||
endif
|
||||
11
package/gptfdisk/Config.in.host
Normal file
11
package/gptfdisk/Config.in.host
Normal file
@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_HOST_GPTFDISK
|
||||
bool "host gptfdisk"
|
||||
select BR2_PACKAGE_HOST_UTIL_LINUX
|
||||
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/
|
||||
5
package/gptfdisk/gptfdisk.hash
Normal file
5
package/gptfdisk/gptfdisk.hash
Normal file
@ -0,0 +1,5 @@
|
||||
# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.9/
|
||||
sha1 284bd000edaf7874b472bd01719c6a71a8030e13 gptfdisk-1.0.9.tar.gz
|
||||
# Locally computed
|
||||
sha256 dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2 gptfdisk-1.0.9.tar.gz
|
||||
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
|
||||
55
package/gptfdisk/gptfdisk.mk
Normal file
55
package/gptfdisk/gptfdisk.mk
Normal file
@ -0,0 +1,55 @@
|
||||
################################################################################
|
||||
#
|
||||
# gptfdisk
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GPTFDISK_VERSION = 1.0.9
|
||||
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_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))
|
||||
Reference in New Issue
Block a user