Compare commits
21 Commits
v2023.10.2
...
v2024.01.1
Author | SHA1 | Date | |
---|---|---|---|
57a40f12e3 | |||
642ed76421 | |||
91f34171b6 | |||
8529525524 | |||
c50babbc50 | |||
b5e7560c53 | |||
9f616e4dd9 | |||
8ca78641ff | |||
e2417fbdcc | |||
82fb14dc36 | |||
655ba28a6c | |||
c053c996d9 | |||
25917a63b9 | |||
53a55bbc48 | |||
cb184ccd4f | |||
5a9623f96f | |||
120da74f01 | |||
c6aa6a8089 | |||
2276e202d2 | |||
2caa7781e0 | |||
241b9ad3cc |
7
Makefile
7
Makefile
@ -5,7 +5,7 @@ GIT_VERSION := $(shell git describe --always)
|
|||||||
DATE_VERSION := $(shell date +%Y.%m.%d)
|
DATE_VERSION := $(shell date +%Y.%m.%d)
|
||||||
FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)
|
FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)
|
||||||
|
|
||||||
OPENWRT_VERSION ?= 22.03.2
|
OPENWRT_VERSION ?= 23.05.2
|
||||||
OPENWRT_TARGET ?= mvebu/cortexa9
|
OPENWRT_TARGET ?= mvebu/cortexa9
|
||||||
OPENWRT_TARGET_DASHED ?= $(shell echo $(OPENWRT_TARGET) | sed 's|/|-|')
|
OPENWRT_TARGET_DASHED ?= $(shell echo $(OPENWRT_TARGET) | sed 's|/|-|')
|
||||||
OPENWRT_PROFILE ?= linksys_wrt1200ac
|
OPENWRT_PROFILE ?= linksys_wrt1200ac
|
||||||
@ -46,7 +46,7 @@ build: $(IMAGEBUILDER_DIR_PATH) $(IMAGEBUILDER_CUSTOM_PACKAGES_DIR_PATH) $(IMAGE
|
|||||||
|
|
||||||
# Cleanup old packages signature
|
# Cleanup old packages signature
|
||||||
rm -f $(IMAGEBUILDER_DIR_PATH)/Packages $(IMAGEBUILDER_DIR_PATH)/Packages.gz $(IMAGEBUILDER_DIR_PATH)/Packages.sig
|
rm -f $(IMAGEBUILDER_DIR_PATH)/Packages $(IMAGEBUILDER_DIR_PATH)/Packages.gz $(IMAGEBUILDER_DIR_PATH)/Packages.sig
|
||||||
|
|
||||||
# Build firmware
|
# Build firmware
|
||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
-C "$(IMAGEBUILDER_DIR_PATH)" \
|
-C "$(IMAGEBUILDER_DIR_PATH)" \
|
||||||
@ -56,6 +56,7 @@ build: $(IMAGEBUILDER_DIR_PATH) $(IMAGEBUILDER_CUSTOM_PACKAGES_DIR_PATH) $(IMAGE
|
|||||||
CONFIG_IPV6=n \
|
CONFIG_IPV6=n \
|
||||||
FILES="$(IMAGEBUILDER_CUSTOM_FILES_DIR_PATH)" \
|
FILES="$(IMAGEBUILDER_CUSTOM_FILES_DIR_PATH)" \
|
||||||
BIN_DIR="$(BIN_DIR)" \
|
BIN_DIR="$(BIN_DIR)" \
|
||||||
|
ROOTFS_PARTSIZE="$(ROOTFS_PARTSIZE)" \
|
||||||
clean image
|
clean image
|
||||||
|
|
||||||
$(IMAGEBUILDER_DIR_PATH): $(IMAGEBUILDER_ARCHIVE_PATH)
|
$(IMAGEBUILDER_DIR_PATH): $(IMAGEBUILDER_ARCHIVE_PATH)
|
||||||
@ -110,7 +111,7 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh
|
|||||||
GITEA_RELEASE_NAME="$(FULL_VERSION)" \
|
GITEA_RELEASE_NAME="$(FULL_VERSION)" \
|
||||||
GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
|
GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
|
||||||
GITEA_RELEASE_IS_DRAFT="false" \
|
GITEA_RELEASE_IS_DRAFT="false" \
|
||||||
GITEA_RELEASE_BODY="With Emissary $(EMISSARY_RELEASE)" \
|
GITEA_RELEASE_BODY='Based on OpenWRT [`$(OPENWRT_VERSION)`](https://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/targets/) and with Emissary [`$(EMISSARY_RELEASE)`](https://forge.cadoles.com/arcad/emissary/releases/tag/$(EMISSARY_RELEASE))' \
|
||||||
GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
|
GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
|
||||||
tools/gitea-release/bin/gitea-release.sh
|
tools/gitea-release/bin/gitea-release.sh
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
2023.10.22-stable.848.327226a
|
2024.1.10-stable.1332.fefac83
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh /etc/rc.common
|
#!/bin/sh /etc/rc.common
|
||||||
|
|
||||||
USE_PROCD=1
|
USE_PROCD=1
|
||||||
START=50
|
START=99
|
||||||
STOP=50
|
STOP=50
|
||||||
|
|
||||||
start_service() {
|
start_service() {
|
||||||
@ -22,7 +22,7 @@ start_service() {
|
|||||||
procd_append_param command --workdir /usr/share/emissary
|
procd_append_param command --workdir /usr/share/emissary
|
||||||
procd_append_param command --config "$config_file"
|
procd_append_param command --config "$config_file"
|
||||||
procd_append_param command agent run
|
procd_append_param command agent run
|
||||||
procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
|
procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-17280}
|
||||||
procd_set_param file "$config_file"
|
procd_set_param file "$config_file"
|
||||||
procd_set_param stdout 1
|
procd_set_param stdout 1
|
||||||
procd_set_param stderr 1
|
procd_set_param stderr 1
|
||||||
|
@ -2,8 +2,6 @@ all: bpi-r3
|
|||||||
|
|
||||||
bpi-r3:
|
bpi-r3:
|
||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
OPENWRT_VERSION="23.05.0-rc4" \
|
|
||||||
IMAGEBUILDER_URL=https://downloads.openwrt.org/releases/23.05.0-rc4/targets/mediatek/filogic/openwrt-imagebuilder-23.05.0-rc4-mediatek-filogic.Linux-x86_64.tar.xz \
|
|
||||||
ADDITIONAL_INSTALL="install-bpi-r3-network-config" \
|
ADDITIONAL_INSTALL="install-bpi-r3-network-config" \
|
||||||
ADDITIONAL_OPENWRT_PACKAGES="block-mount kmod-fs-ext4 kmod-usb-storage kmod-usb2" \
|
ADDITIONAL_OPENWRT_PACKAGES="block-mount kmod-fs-ext4 kmod-usb-storage kmod-usb2" \
|
||||||
OPENWRT_TARGET="mediatek/filogic" \
|
OPENWRT_TARGET="mediatek/filogic" \
|
||||||
|
@ -4,6 +4,7 @@ x86-generic:
|
|||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
ADDITIONAL_INSTALL="install-x86-network-config" \
|
ADDITIONAL_INSTALL="install-x86-network-config" \
|
||||||
ADDITIONAL_OPENWRT_PACKAGES="dmidecode" \
|
ADDITIONAL_OPENWRT_PACKAGES="dmidecode" \
|
||||||
|
ROOTFS_PARTSIZE=1024 \
|
||||||
OPENWRT_TARGET="x86/generic" \
|
OPENWRT_TARGET="x86/generic" \
|
||||||
EMISSARY_ARCH="386" \
|
EMISSARY_ARCH="386" \
|
||||||
OPENWRT_PROFILE="generic" \
|
OPENWRT_PROFILE="generic" \
|
||||||
|
Reference in New Issue
Block a user