* [Buildroot] [PATCH v2 2/3] package/monero: new package
2022-10-31 19:52 [Buildroot] [PATCH v2 1/3] package/unbound: install to staging Bernd Kuhls
@ 2022-10-31 19:52 ` Bernd Kuhls
2022-11-22 22:38 ` Thomas Petazzoni via buildroot
2022-10-31 19:52 ` [Buildroot] [PATCH v2 3/3] package/p2pool: " Bernd Kuhls
2022-11-22 22:41 ` [Buildroot] [PATCH v2 1/3] package/unbound: install to staging Thomas Petazzoni via buildroot
2 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2022-10-31 19:52 UTC (permalink / raw)
To: buildroot; +Cc: Samuel Martin, Stefan Ott
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: disabled support for BR2_aarch64_be, not supported upstream:
https://github.com/tevador/RandomX/pull/257
DEVELOPERS | 1 +
package/Config.in | 1 +
.../monero/0001-disable-stack-protector.patch | 22 ++++
package/monero/0002-system-miniupnpc.patch | 112 ++++++++++++++++++
package/monero/Config.in | 35 ++++++
package/monero/monero.hash | 3 +
package/monero/monero.mk | 55 +++++++++
7 files changed, 229 insertions(+)
create mode 100644 package/monero/0001-disable-stack-protector.patch
create mode 100644 package/monero/0002-system-miniupnpc.patch
create mode 100644 package/monero/Config.in
create mode 100644 package/monero/monero.hash
create mode 100644 package/monero/monero.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 06ee5d8056..7db7954871 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -407,6 +407,7 @@ F: package/libyuv/
F: package/mesa3d/
F: package/minidlna/
F: package/mjpg-streamer/
+F: package/monero/
F: package/nut/
F: package/perl-crypt-openssl-guess/
F: package/perl-crypt-openssl-random/
diff --git a/package/Config.in b/package/Config.in
index fff8186351..ac811bf2e4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2179,6 +2179,7 @@ menu "Miscellaneous"
source "package/haveged/Config.in"
source "package/linux-syscall-support/Config.in"
source "package/mobile-broadband-provider-info/Config.in"
+ source "package/monero/Config.in"
source "package/netdata/Config.in"
source "package/proj/Config.in"
source "package/qemu/Config.in"
diff --git a/package/monero/0001-disable-stack-protector.patch b/package/monero/0001-disable-stack-protector.patch
new file mode 100644
index 0000000000..0407b4e32d
--- /dev/null
+++ b/package/monero/0001-disable-stack-protector.patch
@@ -0,0 +1,22 @@
+Disable unconditional stack-protector support
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr monero-source-v0.18.1.0.orig/CMakeLists.txt monero-source-v0.18.1.0/CMakeLists.txt
+--- monero-source-v0.18.1.0.orig/CMakeLists.txt 2022-08-10 05:34:23.000000000 +0200
++++ monero-source-v0.18.1.0/CMakeLists.txt 2022-08-15 18:40:52.240699837 +0200
+@@ -831,14 +831,6 @@
+ add_c_flag_if_supported(-Wformat-security C_SECURITY_FLAGS)
+ add_cxx_flag_if_supported(-Wformat-security CXX_SECURITY_FLAGS)
+
+- # -fstack-protector
+- if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
+- add_c_flag_if_supported(-fstack-protector C_SECURITY_FLAGS)
+- add_cxx_flag_if_supported(-fstack-protector CXX_SECURITY_FLAGS)
+- add_c_flag_if_supported(-fstack-protector-strong C_SECURITY_FLAGS)
+- add_cxx_flag_if_supported(-fstack-protector-strong CXX_SECURITY_FLAGS)
+- endif()
+-
+ # New in GCC 8.2
+ if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
+ add_c_flag_if_supported(-fcf-protection=full C_SECURITY_FLAGS)
diff --git a/package/monero/0002-system-miniupnpc.patch b/package/monero/0002-system-miniupnpc.patch
new file mode 100644
index 0000000000..e12d9302bd
--- /dev/null
+++ b/package/monero/0002-system-miniupnpc.patch
@@ -0,0 +1,112 @@
+Add support for miniupnpc system library
+
+Downloaded from
+https://git.alpinelinux.org/aports/plain/community/monero/system-miniupnpc.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -676,6 +676,14 @@
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+ add_subdirectory(external)
+
++# Final setup for miniupnpc
++if(UPNP_STATIC OR IOS)
++ add_definitions("-DUPNP_STATIC")
++else()
++ add_definitions("-DUPNP_DYNAMIC")
++ include_directories(${UPNP_INCLUDE})
++endif()
++
+ # Final setup for libunbound
+ include_directories(${UNBOUND_INCLUDE_DIR})
+
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index 9b21705e..76340a22 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
+--
+2.17.0
+
+--- a/external/CMakeLists.txt 2021-12-04 03:56:51.405517304 +0200
++++ b/external/CMakeLists.txt 2021-12-04 04:02:37.649484660 +0200
+@@ -34,24 +34,46 @@
+ # We always compile if we are building statically to reduce static dependency issues...
+ # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
+ # others.
++if(NOT IOS)
++ find_package(Miniupnpc QUIET)
++endif()
+
+-find_package(Miniupnpc REQUIRED)
+-
+-message(STATUS "Using in-tree miniupnpc")
+-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
+-add_subdirectory(miniupnp/miniupnpc)
+-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
+-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
+-if(MSVC)
+- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
+-elseif(NOT MSVC)
+- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
++# If we have the correct shared version and we're not building static, use it
++if(STATIC OR IOS)
++ set(USE_SHARED_MINIUPNPC false)
++elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
++ set(USE_SHARED_MINIUPNPC true)
+ endif()
++
++
++if(USE_SHARED_MINIUPNPC)
++ message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}")
++
++ set(UPNP_STATIC false PARENT_SCOPE)
++ set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
++ set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
++else()
++ if(STATIC)
++ message(STATUS "Using miniupnpc from local source tree for static build")
++ else()
++ message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)")
++ endif()
++ add_subdirectory(miniupnp/miniupnpc)
++
++ set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
++ if(MSVC)
++ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
++ elseif(NOT MSVC)
++ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
++ endif()
++
+ if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
+ endif()
+
+-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
++ set(UPNP_STATIC true PARENT_SCOPE)
++ set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
++endif()
+
+ find_package(Unbound)
+
diff --git a/package/monero/Config.in b/package/monero/Config.in
new file mode 100644
index 0000000000..59036286cd
--- /dev/null
+++ b/package/monero/Config.in
@@ -0,0 +1,35 @@
+config BR2_PACKAGE_MONERO
+ bool "monero"
+ depends on !BR2_aarch64_be && !BR2_i386
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem
+ # monero needs fenv.h which is not provided by uclibc
+ depends on !BR2_TOOLCHAIN_USES_UCLIBC
+ select BR2_PACKAGE_BOOST
+ select BR2_PACKAGE_BOOST_CHRONO
+ select BR2_PACKAGE_BOOST_DATE_TIME
+ select BR2_PACKAGE_BOOST_FILESYSTEM
+ select BR2_PACKAGE_BOOST_LOCALE
+ select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+ select BR2_PACKAGE_BOOST_REGEX
+ select BR2_PACKAGE_BOOST_SERIALIZATION
+ select BR2_PACKAGE_BOOST_SYSTEM
+ select BR2_PACKAGE_BOOST_THREAD
+ select BR2_PACKAGE_CZMQ
+ select BR2_PACKAGE_LIBMINIUPNPC
+ select BR2_PACKAGE_LIBSODIUM
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_UNBOUND
+ help
+ The secure, private, untraceable cryptocurrency
+
+ https://getmonero.org/
+
+comment "monero needs a glibc or musl toolchain w/ C++, dynamic library, threads"
+ depends on !BR2_aarch64_be && !BR2_i386
+ depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
+ depends on BR2_TOOLCHAIN_USES_UCLIBC || \
+ !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
+ !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/monero/monero.hash b/package/monero/monero.hash
new file mode 100644
index 0000000000..91f452cbec
--- /dev/null
+++ b/package/monero/monero.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 0b667acba2223f8f082b388d7ceb5d212e0515b8a94395f3ec69183ef4bebf6c monero-source-v0.18.1.2.tar.bz2
+sha256 c2fe351163f4e0cee45d38e9481f2ea60f3cb77b24f818c4a2c740383f2f4cb2 LICENSE
diff --git a/package/monero/monero.mk b/package/monero/monero.mk
new file mode 100644
index 0000000000..ee215f90e1
--- /dev/null
+++ b/package/monero/monero.mk
@@ -0,0 +1,55 @@
+################################################################################
+#
+# monero
+#
+################################################################################
+
+MONERO_VERSION = 0.18.1.2
+MONERO_SOURCE = monero-source-v$(MONERO_VERSION).tar.bz2
+MONERO_SITE = https://downloads.getmonero.org/cli
+MONERO_LICENSE = MIT
+MONERO_LICENSE_FILES = LICENSE
+MONERO_CONF_OPTS = \
+ -DBUILD_DOCUMENTATION=OFF \
+ -DCMAKE_CXX_FLAGS="$(MONERO_CXXFLAGS)" \
+ -DCMAKE_BUILD_TYPE=None \
+ -DMANUAL_SUBMODULES=ON \
+ -DSTACK_TRACE=OFF \
+ -DUSE_CCACHE=OFF \
+ -DUSE_DEVICE_TREZOR=OFF
+MONERO_DEPENDENCIES = \
+ boost \
+ czmq \
+ libminiupnpc \
+ libsodium \
+ openssl \
+ unbound
+
+ifeq ($(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64el)$(BR2_sparc64),y)
+MONERO_CONF_OPTS += -DNO_AES=ON
+endif
+
+MONERO_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11
+
+# Uses __atomic_load_8
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+MONERO_CXXFLAGS += -latomic
+endif
+
+# relocation truncated to fit: R_MIPS_GOT16
+ifeq ($(BR2_mipsel),y)
+MONERO_CXXFLAGS += -mxgot
+endif
+
+ifeq ($(BR2_PACKAGE_HIDAPI),y)
+MONERO_DEPENDENCIES += hidapi
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+MONERO_CONF_OPTS += -DUSE_READLINE=ON
+MONERO_DEPENDENCIES += readline
+else
+MONERO_CONF_OPTS += -DUSE_READLINE=OFF
+endif
+
+$(eval $(cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2 3/3] package/p2pool: new package
2022-10-31 19:52 [Buildroot] [PATCH v2 1/3] package/unbound: install to staging Bernd Kuhls
2022-10-31 19:52 ` [Buildroot] [PATCH v2 2/3] package/monero: new package Bernd Kuhls
@ 2022-10-31 19:52 ` Bernd Kuhls
2022-11-22 22:41 ` Thomas Petazzoni via buildroot
2022-11-22 22:41 ` [Buildroot] [PATCH v2 1/3] package/unbound: install to staging Thomas Petazzoni via buildroot
2 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2022-10-31 19:52 UTC (permalink / raw)
To: buildroot; +Cc: Samuel Martin, Stefan Ott
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: disabled support for BR2_aarch64_be, not supported upstream:
https://github.com/tevador/RandomX/pull/257
DEVELOPERS | 1 +
package/Config.in | 1 +
package/p2pool/Config.in | 27 +++++++++++++++++++++++++++
package/p2pool/p2pool.hash | 3 +++
package/p2pool/p2pool.mk | 27 +++++++++++++++++++++++++++
5 files changed, 59 insertions(+)
create mode 100644 package/p2pool/Config.in
create mode 100644 package/p2pool/p2pool.hash
create mode 100644 package/p2pool/p2pool.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 7db7954871..3a2a15216e 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -409,6 +409,7 @@ F: package/minidlna/
F: package/mjpg-streamer/
F: package/monero/
F: package/nut/
+F: package/p2pool/
F: package/perl-crypt-openssl-guess/
F: package/perl-crypt-openssl-random/
F: package/perl-crypt-openssl-rsa/
diff --git a/package/Config.in b/package/Config.in
index ac811bf2e4..d14e7473b6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2181,6 +2181,7 @@ menu "Miscellaneous"
source "package/mobile-broadband-provider-info/Config.in"
source "package/monero/Config.in"
source "package/netdata/Config.in"
+ source "package/p2pool/Config.in"
source "package/proj/Config.in"
source "package/qemu/Config.in"
source "package/qpdf/Config.in"
diff --git a/package/p2pool/Config.in b/package/p2pool/Config.in
new file mode 100644
index 0000000000..53f894e309
--- /dev/null
+++ b/package/p2pool/Config.in
@@ -0,0 +1,27 @@
+config BR2_PACKAGE_P2POOL
+ bool "p2pool"
+ depends on BR2_ARCH_IS_64
+ depends on !BR2_aarch64_be
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS # libuv
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
+ depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
+ # p2pool needs fenv.h which is not provided by uclibc
+ depends on !BR2_TOOLCHAIN_USES_UCLIBC
+ depends on BR2_USE_MMU # libuv
+ select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_LIBUV
+ select BR2_PACKAGE_ZEROMQ
+ help
+ Decentralized pool for Monero mining
+
+ https://p2pool.io/
+
+comment "monero needs a glibc or musl toolchain w/ C++, NPTL, dynamic library"
+ depends on BR2_ARCH_IS_64
+ depends on !BR2_aarch64_be
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on BR2_USE_MMU
+ depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
+ BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
+ BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/p2pool/p2pool.hash b/package/p2pool/p2pool.hash
new file mode 100644
index 0000000000..b2d2ebd195
--- /dev/null
+++ b/package/p2pool/p2pool.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 ba00735eb0b6bd357c041492d2c8b76e9b39d397123611c4f32412e65d8aafca p2pool-v2.4-br1.tar.gz
+sha256 605e9047a563c5c8396ffb18232aa4304ec56586aee537c45064c6fb425e44ad LICENSE
diff --git a/package/p2pool/p2pool.mk b/package/p2pool/p2pool.mk
new file mode 100644
index 0000000000..75b3409b19
--- /dev/null
+++ b/package/p2pool/p2pool.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# p2pool
+#
+################################################################################
+
+P2POOL_VERSION = v2.4
+P2POOL_SITE_METHOD = git
+P2POOL_SITE = https://github.com/SChernykh/p2pool.git
+P2POOL_GIT_SUBMODULES = YES
+P2POOL_LICENSE = GPL-3.0+
+P2POOL_LICENSE_FILES = LICENSE
+P2POOL_DEPENDENCIES = libcurl libuv zeromq
+
+# prevent compiler warnings being treated as errors
+define P2POOL_REMOVE_WARNING_FLAGS
+ $(SED) '/set(WARNING_FLAGS/d' $(@D)/cmake/flags.cmake
+endef
+P2POOL_POST_PATCH_HOOKS += P2POOL_REMOVE_WARNING_FLAGS
+
+# Upstream provides no installation rule:
+# *** No rule to make target 'install/fast'. Stop.
+define P2POOL_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/p2pool $(TARGET_DIR)/usr/bin/p2pool
+endef
+
+$(eval $(cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread