Skip to content

Commit 3527945

Browse files
committed
v1.29.1 Breacking changes fixed p1
1 parent caec2a5 commit 3527945

File tree

12 files changed

+665
-25
lines changed

12 files changed

+665
-25
lines changed

Config.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55

66
# Load external packages
77
source "$NERVES_DEFCONFIG_DIR/packages/frpc/Config.in"
8-
source "$NERVES_DEFCONFIG_DIR/packages/cloudflared/Config.in"
8+
source "$NERVES_DEFCONFIG_DIR/packages/cloudflared-bin/Config.in"
9+
source "$NERVES_DEFCONFIG_DIR/packages/mosquitto-external/Config.in"

nerves_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ BR2_PACKAGE_BRIDGE_UTILS=y
7777
BR2_PACKAGE_CAN_UTILS=y
7878
BR2_PACKAGE_IPERF3=y
7979
BR2_PACKAGE_IPROUTE2=y
80-
BR2_PACKAGE_MOSQUITTO=y
80+
# In buildroot 2024.08.03 mosquitto is broken.
81+
# When nerves support buildroot 2024.11.2 (or greater) release
82+
# use BR2_PACKAGE_MOSQUITTO=y instead
83+
BR2_PACKAGE_MOSQUITTO_EXTERNAL=y
8184
BR2_PACKAGE_NMAP=y
8285
BR2_PACKAGE_SOCKETCAND=y
8386
BR2_PACKAGE_TCPDUMP=y
@@ -105,4 +108,4 @@ BR2_PACKAGE_RPICAM_APPS=y
105108
BR2_PACKAGE_RPI_DISTRO_FIRMWARE_NONFREE=y
106109
BR2_PACKAGE_RPI_LIBCAMERA_V4L2=y
107110
BR2_PACKAGE_FRPC=y
108-
BR2_PACKAGE_CLOUDFLARED=y
111+
BR2_PACKAGE_CLOUDFLARED_BIN=y

packages/cloudflared/Config.in renamed to packages/cloudflared-bin/Config.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
config BR2_PACKAGE_CLOUDFLARED
2-
bool "cloudflared"
1+
config BR2_PACKAGE_CLOUDFLARED_BIN
2+
bool "cloudflared-bin"
33
help
44
Argo Tunnel client (precompilated for armv6).
55

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#############################################################
2+
#
3+
# CLOUDFLARED_BIN
4+
#
5+
#############################################################
6+
7+
CLOUDFLARED_BIN_VERSION := 2025.2.1
8+
CLOUDFLARED_BIN_SOURCE := cloudflared-linux-arm64
9+
CLOUDFLARED_BIN_SITE := https://github.com/cloudflare/cloudflared/releases/download/$(CLOUDFLARED_BIN_VERSION)
10+
11+
#There is no tarball package, it is a raw binary
12+
define CLOUDFLARED_BIN_EXTRACT_CMDS
13+
endef
14+
15+
define CLOUDFLARED_BIN_INSTALL_TARGET_CMDS
16+
$(INSTALL) -D -m 755 $(CLOUDFLARED_BIN_DL_DIR)/$(CLOUDFLARED_BIN_SOURCE) $(TARGET_DIR)/usr/bin/cloudflared
17+
endef
18+
19+
$(eval $(generic-package))

packages/cloudflared/cloudflared.mk

Lines changed: 0 additions & 19 deletions
This file was deleted.

packages/frpc/frpc.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
#############################################################
66

7-
FRPC_VERSION := 0.57.0
7+
FRPC_VERSION := 0.61.2
88
FRPC_SOURCE := frp_${FRPC_VERSION}_linux_arm64.tar.gz
99
FRPC_SITE := https://github.com/fatedier/frp/releases/download/v$(FRPC_VERSION)
1010
FRPC_LICENSE := Apache-2.0

0 commit comments

Comments
 (0)